diff options
| author | Nikolay Borisov <kernel@kyup.com> | 2016-02-03 09:46:50 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-02-07 14:35:10 -0500 |
| commit | 7c083ecb3ba4583a625d5ff9655d1a819e374493 (patch) | |
| tree | de833034c44e605efdc1f15967df49e2895aa73e /net/ipv4/inet_connection_sock.c | |
| parent | 6fa251663069e05daadd1666cbf3b658bf840ea4 (diff) | |
| download | linux-7c083ecb3ba4583a625d5ff9655d1a819e374493.tar.gz linux-7c083ecb3ba4583a625d5ff9655d1a819e374493.tar.bz2 linux-7c083ecb3ba4583a625d5ff9655d1a819e374493.zip | |
ipv4: Namespaceify tcp synack retries sysctl knob
Signed-off-by: Nikolay Borisov <kernel@kyup.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/inet_connection_sock.c')
| -rw-r--r-- | net/ipv4/inet_connection_sock.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/net/ipv4/inet_connection_sock.c b/net/ipv4/inet_connection_sock.c index 46b9c887bede..9b17c1792dce 100644 --- a/net/ipv4/inet_connection_sock.c +++ b/net/ipv4/inet_connection_sock.c @@ -482,10 +482,6 @@ EXPORT_SYMBOL_GPL(inet_csk_route_child_sock); #define AF_INET_FAMILY(fam) true #endif -/* Only thing we need from tcp.h */ -extern int sysctl_tcp_synack_retries; - - /* Decide when to expire the request and when to resend SYN-ACK */ static inline void syn_ack_recalc(struct request_sock *req, const int thresh, const int max_retries, @@ -557,6 +553,7 @@ static void reqsk_timer_handler(unsigned long data) { struct request_sock *req = (struct request_sock *)data; struct sock *sk_listener = req->rsk_listener; + struct net *net = sock_net(sk_listener); struct inet_connection_sock *icsk = inet_csk(sk_listener); struct request_sock_queue *queue = &icsk->icsk_accept_queue; int qlen, expire = 0, resend = 0; @@ -566,7 +563,7 @@ static void reqsk_timer_handler(unsigned long data) if (sk_state_load(sk_listener) != TCP_LISTEN) goto drop; - max_retries = icsk->icsk_syn_retries ? : sysctl_tcp_synack_retries; + max_retries = icsk->icsk_syn_retries ? : net->ipv4.sysctl_tcp_synack_retries; thresh = max_retries; /* Normally all the openreqs are young and become mature * (i.e. converted to established socket) for first timeout. |