ipv4: Namespaceify tcp_retries1 sysctl knob

Signed-off-by: Nikolay Borisov <kernel@kyup.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 4 insertions, 4 deletions

diff --git a/net/ipv4/tcp_timer.c b/net/ipv4/tcp_timer.c
index ca25fdf0c525..6694e33149b9 100644
--- a/net/ipv4/tcp_timer.c
+++ b/net/ipv4/tcp_timer.c
@@ -22,7 +22,6 @@
 #include <linux/gfp.h>
 #include <net/tcp.h>
 
-int sysctl_tcp_retries1 __read_mostly = TCP_RETR1;
 int sysctl_tcp_retries2 __read_mostly = TCP_RETR2;
 int sysctl_tcp_orphan_retries __read_mostly;
 int sysctl_tcp_thin_linear_timeouts __read_mostly;
@@ -171,7 +170,7 @@ static int tcp_write_timeout(struct sock *sk)
                 retry_until = icsk->icsk_syn_retries ? : net->ipv4.sysctl_tcp_syn_retries;
                 syn_set = true;
         } else {
-                if (retransmits_timed_out(sk, sysctl_tcp_retries1, 0, 0)) {
+                if (retransmits_timed_out(sk, net->ipv4.sysctl_tcp_retries1, 0, 0)) {
                         /* Some middle-boxes may black-hole Fast Open _after_
                          * the handshake. Therefore we conservatively disable
                          * Fast Open on this path on recurring timeouts with
@@ -180,7 +179,7 @@ static int tcp_write_timeout(struct sock *sk)
                         if (tp->syn_data_acked &&
                             tp->bytes_acked <= tp->rx_opt.mss_clamp) {
                                 tcp_fastopen_cache_set(sk, 0, NULL, true, 0);
-                                if (icsk->icsk_retransmits == sysctl_tcp_retries1)
+                                if (icsk->icsk_retransmits == net->ipv4.sysctl_tcp_retries1)
                                         NET_INC_STATS_BH(sock_net(sk),
                                                          LINUX_MIB_TCPFASTOPENACTIVEFAIL);
                         }
@@ -359,6 +358,7 @@ static void tcp_fastopen_synack_timer(struct sock *sk)
 void tcp_retransmit_timer(struct sock *sk)
 {
         struct tcp_sock *tp = tcp_sk(sk);
+        struct net *net = sock_net(sk);
         struct inet_connection_sock *icsk = inet_csk(sk);
 
         if (tp->fastopen_rsk) {
@@ -489,7 +489,7 @@ out_reset_timer:
                 icsk->icsk_rto = min(icsk->icsk_rto << 1, TCP_RTO_MAX);
         }
         inet_csk_reset_xmit_timer(sk, ICSK_TIME_RETRANS, icsk->icsk_rto, TCP_RTO_MAX);
-        if (retransmits_timed_out(sk, sysctl_tcp_retries1 + 1, 0, 0))
+        if (retransmits_timed_out(sk, net->ipv4.sysctl_tcp_retries1 + 1, 0, 0))
                 __sk_dst_reset(sk);
 
 out:;