aboutsummaryrefslogtreecommitdiffstats
path: root/include/net/tcp.h
diff options
context:
space:
mode:
authorNikolay Borisov <kernel@kyup.com>2016-02-03 02:46:56 -0500
committerDavid S. Miller <davem@davemloft.net>2016-02-07 14:36:11 -0500
commit1e579caa18b96f9eb18f4f5416658cd15f37c062 (patch)
tree7c48df6e8e727a5db5ff50c3e6296ff96915c934 /include/net/tcp.h
parentc402d9beffb6141ab2e4d2ad8be71128803a28ca (diff)
ipv4: Namespaceify tcp_fin_timeout sysctl knob
Signed-off-by: Nikolay Borisov <kernel@kyup.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net/tcp.h')
-rw-r--r--include/net/tcp.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/include/net/tcp.h b/include/net/tcp.h
index 71f840b89c76..3f160c2e6960 100644
--- a/include/net/tcp.h
+++ b/include/net/tcp.h
@@ -239,7 +239,6 @@ extern struct inet_timewait_death_row tcp_death_row;
239extern int sysctl_tcp_timestamps; 239extern int sysctl_tcp_timestamps;
240extern int sysctl_tcp_window_scaling; 240extern int sysctl_tcp_window_scaling;
241extern int sysctl_tcp_sack; 241extern int sysctl_tcp_sack;
242extern int sysctl_tcp_fin_timeout;
243extern int sysctl_tcp_fastopen; 242extern int sysctl_tcp_fastopen;
244extern int sysctl_tcp_retrans_collapse; 243extern int sysctl_tcp_retrans_collapse;
245extern int sysctl_tcp_stdurg; 244extern int sysctl_tcp_stdurg;
@@ -1249,7 +1248,7 @@ static inline u32 keepalive_time_elapsed(const struct tcp_sock *tp)
1249 1248
1250static inline int tcp_fin_time(const struct sock *sk) 1249static inline int tcp_fin_time(const struct sock *sk)
1251{ 1250{
1252 int fin_timeout = tcp_sk(sk)->linger2 ? : sysctl_tcp_fin_timeout; 1251 int fin_timeout = tcp_sk(sk)->linger2 ? : sock_net(sk)->ipv4.sysctl_tcp_fin_timeout;
1253 const int rto = inet_csk(sk)->icsk_rto; 1252 const int rto = inet_csk(sk)->icsk_rto;
1254 1253
1255 if (fin_timeout < (rto << 2) - (rto >> 1)) 1254 if (fin_timeout < (rto << 2) - (rto >> 1))