diff options
author | Nikolay Borisov <kernel@kyup.com> | 2016-02-03 02:46:55 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2016-02-07 14:35:11 -0500 |
commit | c402d9beffb6141ab2e4d2ad8be71128803a28ca (patch) | |
tree | b0ce35c5aed6135bc4d3f07643a8148715b5e679 /net/ipv4/tcp_timer.c | |
parent | c6214a97c86c660de4f7ddb8eed925192e646161 (diff) |
ipv4: Namespaceify tcp_orphan_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/tcp_timer.c')
-rw-r--r-- | net/ipv4/tcp_timer.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/ipv4/tcp_timer.c b/net/ipv4/tcp_timer.c index 09f4e0297e56..49bc474f8e35 100644 --- a/net/ipv4/tcp_timer.c +++ b/net/ipv4/tcp_timer.c | |||
@@ -22,7 +22,6 @@ | |||
22 | #include <linux/gfp.h> | 22 | #include <linux/gfp.h> |
23 | #include <net/tcp.h> | 23 | #include <net/tcp.h> |
24 | 24 | ||
25 | int sysctl_tcp_orphan_retries __read_mostly; | ||
26 | int sysctl_tcp_thin_linear_timeouts __read_mostly; | 25 | int sysctl_tcp_thin_linear_timeouts __read_mostly; |
27 | 26 | ||
28 | static void tcp_write_err(struct sock *sk) | 27 | static void tcp_write_err(struct sock *sk) |
@@ -78,7 +77,7 @@ static int tcp_out_of_resources(struct sock *sk, bool do_reset) | |||
78 | /* Calculate maximal number or retries on an orphaned socket. */ | 77 | /* Calculate maximal number or retries on an orphaned socket. */ |
79 | static int tcp_orphan_retries(struct sock *sk, bool alive) | 78 | static int tcp_orphan_retries(struct sock *sk, bool alive) |
80 | { | 79 | { |
81 | int retries = sysctl_tcp_orphan_retries; /* May be zero. */ | 80 | int retries = sock_net(sk)->ipv4.sysctl_tcp_orphan_retries; /* May be zero. */ |
82 | 81 | ||
83 | /* We know from an ICMP that something is wrong. */ | 82 | /* We know from an ICMP that something is wrong. */ |
84 | if (sk->sk_err_soft && !alive) | 83 | if (sk->sk_err_soft && !alive) |