diff options
author | Eric Dumazet <edumazet@google.com> | 2017-10-27 00:55:00 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2017-10-27 03:35:42 -0400 |
commit | e0a1e5b519236dc1662ff25e42560dd1be9e3776 (patch) | |
tree | 7ed11af0df910b4bf45341145de281f4e4454285 /net/ipv4/tcp_output.c | |
parent | b510f0d23a47c3d1f074fe583e7867dc4918fe02 (diff) |
tcp: Namespace-ify sysctl_tcp_retrans_collapse
Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/tcp_output.c')
-rw-r--r-- | net/ipv4/tcp_output.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c index bdc288a06f94..55a0aa4b96df 100644 --- a/net/ipv4/tcp_output.c +++ b/net/ipv4/tcp_output.c | |||
@@ -45,9 +45,6 @@ | |||
45 | 45 | ||
46 | #include <trace/events/tcp.h> | 46 | #include <trace/events/tcp.h> |
47 | 47 | ||
48 | /* People can turn this off for buggy TCP's found in printers etc. */ | ||
49 | int sysctl_tcp_retrans_collapse __read_mostly = 1; | ||
50 | |||
51 | /* People can turn this on to work with those rare, broken TCPs that | 48 | /* People can turn this on to work with those rare, broken TCPs that |
52 | * interpret the window field as a signed quantity. | 49 | * interpret the window field as a signed quantity. |
53 | */ | 50 | */ |
@@ -2804,7 +2801,7 @@ static void tcp_retrans_try_collapse(struct sock *sk, struct sk_buff *to, | |||
2804 | struct sk_buff *skb = to, *tmp; | 2801 | struct sk_buff *skb = to, *tmp; |
2805 | bool first = true; | 2802 | bool first = true; |
2806 | 2803 | ||
2807 | if (!sysctl_tcp_retrans_collapse) | 2804 | if (!sock_net(sk)->ipv4.sysctl_tcp_retrans_collapse) |
2808 | return; | 2805 | return; |
2809 | if (TCP_SKB_CB(skb)->tcp_flags & TCPHDR_SYN) | 2806 | if (TCP_SKB_CB(skb)->tcp_flags & TCPHDR_SYN) |
2810 | return; | 2807 | return; |