diff options
| author | Nikolay Borisov | 2016-02-03 08:46:52 +0100 |
|---|---|---|
| committer | David S. Miller | 2016-02-07 20:35:10 +0100 |
| commit | 1043e25ff96a1efc7bd34d11f5f32203a28a3bd7 (patch) | |
| tree | 56eb979f398384e49864dfcfb40d0c48e7a7f622 /include/net | |
| parent | ipv4: Namespaceify tcp syncookies sysctl knob (diff) | |
| download | kernel-qcow2-linux-1043e25ff96a1efc7bd34d11f5f32203a28a3bd7.tar.gz kernel-qcow2-linux-1043e25ff96a1efc7bd34d11f5f32203a28a3bd7.tar.xz kernel-qcow2-linux-1043e25ff96a1efc7bd34d11f5f32203a28a3bd7.zip | |
ipv4: Namespaceify tcp reordering sysctl knob
Signed-off-by: Nikolay Borisov <kernel@kyup.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net')
| -rw-r--r-- | include/net/netns/ipv4.h | 2 | ||||
| -rw-r--r-- | include/net/tcp.h | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/include/net/netns/ipv4.h b/include/net/netns/ipv4.h index ac000fccdf0f..eb4cd0a3c296 100644 --- a/include/net/netns/ipv4.h +++ b/include/net/netns/ipv4.h @@ -100,8 +100,8 @@ struct netns_ipv4 { int sysctl_tcp_syn_retries; int sysctl_tcp_synack_retries; - int sysctl_tcp_syncookies; + int sysctl_tcp_reordering; struct ping_group_range ping_group_range; diff --git a/include/net/tcp.h b/include/net/tcp.h index 1fb23b70d237..7e9a147cabae 100644 --- a/include/net/tcp.h +++ b/include/net/tcp.h @@ -961,9 +961,11 @@ static inline void tcp_enable_fack(struct tcp_sock *tp) */ static inline void tcp_enable_early_retrans(struct tcp_sock *tp) { + struct net *net = sock_net((struct sock *)tp); + tp->do_early_retrans = sysctl_tcp_early_retrans && sysctl_tcp_early_retrans < 4 && !sysctl_tcp_thin_dupack && - sysctl_tcp_reordering == 3; + net->ipv4.sysctl_tcp_reordering == 3; } static inline void tcp_disable_early_retrans(struct tcp_sock *tp) |