diff options
author | Eric Dumazet <edumazet@google.com> | 2017-10-27 00:55:07 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2017-10-27 03:35:43 -0400 |
commit | 6496f6bde0c323fba5e8c5b5cbf3a7bf28dad7ed (patch) | |
tree | e38381a236d932f7cbf2f45c37457639ab6e40de /net/ipv4/tcp_input.c | |
parent | c6e218035913e14952b04ceecf1a543205106fdb (diff) |
tcp: Namespace-ify sysctl_tcp_dsack
Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/tcp_input.c')
-rw-r--r-- | net/ipv4/tcp_input.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c index c118657f06ee..fd77037ac800 100644 --- a/net/ipv4/tcp_input.c +++ b/net/ipv4/tcp_input.c | |||
@@ -79,7 +79,6 @@ | |||
79 | #include <linux/unaligned/access_ok.h> | 79 | #include <linux/unaligned/access_ok.h> |
80 | #include <linux/static_key.h> | 80 | #include <linux/static_key.h> |
81 | 81 | ||
82 | int sysctl_tcp_dsack __read_mostly = 1; | ||
83 | int sysctl_tcp_app_win __read_mostly = 31; | 82 | int sysctl_tcp_app_win __read_mostly = 31; |
84 | int sysctl_tcp_adv_win_scale __read_mostly = 1; | 83 | int sysctl_tcp_adv_win_scale __read_mostly = 1; |
85 | EXPORT_SYMBOL(sysctl_tcp_adv_win_scale); | 84 | EXPORT_SYMBOL(sysctl_tcp_adv_win_scale); |
@@ -4150,7 +4149,7 @@ static void tcp_dsack_set(struct sock *sk, u32 seq, u32 end_seq) | |||
4150 | { | 4149 | { |
4151 | struct tcp_sock *tp = tcp_sk(sk); | 4150 | struct tcp_sock *tp = tcp_sk(sk); |
4152 | 4151 | ||
4153 | if (tcp_is_sack(tp) && sysctl_tcp_dsack) { | 4152 | if (tcp_is_sack(tp) && sock_net(sk)->ipv4.sysctl_tcp_dsack) { |
4154 | int mib_idx; | 4153 | int mib_idx; |
4155 | 4154 | ||
4156 | if (before(seq, tp->rcv_nxt)) | 4155 | if (before(seq, tp->rcv_nxt)) |
@@ -4185,7 +4184,7 @@ static void tcp_send_dupack(struct sock *sk, const struct sk_buff *skb) | |||
4185 | NET_INC_STATS(sock_net(sk), LINUX_MIB_DELAYEDACKLOST); | 4184 | NET_INC_STATS(sock_net(sk), LINUX_MIB_DELAYEDACKLOST); |
4186 | tcp_enter_quickack_mode(sk); | 4185 | tcp_enter_quickack_mode(sk); |
4187 | 4186 | ||
4188 | if (tcp_is_sack(tp) && sysctl_tcp_dsack) { | 4187 | if (tcp_is_sack(tp) && sock_net(sk)->ipv4.sysctl_tcp_dsack) { |
4189 | u32 end_seq = TCP_SKB_CB(skb)->end_seq; | 4188 | u32 end_seq = TCP_SKB_CB(skb)->end_seq; |
4190 | 4189 | ||
4191 | if (after(TCP_SKB_CB(skb)->end_seq, tp->rcv_nxt)) | 4190 | if (after(TCP_SKB_CB(skb)->end_seq, tp->rcv_nxt)) |