Merge branch 'ns-tcp-sysctls'

Nikolay Borisov says:

====================
Namespaceify more of the tcp sysctl knobs

This patch series continues making more of the tcp-related
sysctl knobs be per net-namespace. Most of these apply per
socket and have global defaults so should be safe and I
don't expect any breakages.

Having those per net-namespace is useful when multiple
containers are hosted and it is required to tune the
tcp settings for each independently of the host node.

I've split the patches to be per-sysctl but after
the review if the outcome is positive I'm happy
to either send it in one big blob or just.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 10 insertions, 1 deletions

diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c
index a4d523709ab3..11ae706f53a1 100644
--- a/net/ipv4/tcp_ipv4.c
+++ b/net/ipv4/tcp_ipv4.c
@@ -860,7 +860,6 @@ static void tcp_v4_reqsk_destructor(struct request_sock *req)
         kfree(inet_rsk(req)->opt);
 }
 
-
 #ifdef CONFIG_TCP_MD5SIG
 /*
  * RFC2385 MD5 checksumming requires a mapping of
@@ -2388,6 +2387,16 @@ static int __net_init tcp_sk_init(struct net *net)
         net->ipv4.sysctl_tcp_keepalive_probes = TCP_KEEPALIVE_PROBES;
         net->ipv4.sysctl_tcp_keepalive_intvl = TCP_KEEPALIVE_INTVL;
 
+        net->ipv4.sysctl_tcp_syn_retries = TCP_SYN_RETRIES;
+        net->ipv4.sysctl_tcp_synack_retries = TCP_SYNACK_RETRIES;
+        net->ipv4.sysctl_tcp_syncookies = 0;
+        net->ipv4.sysctl_tcp_reordering = TCP_FASTRETRANS_THRESH;
+        net->ipv4.sysctl_tcp_retries1 = TCP_RETR1;
+        net->ipv4.sysctl_tcp_retries2 = TCP_RETR2;
+        net->ipv4.sysctl_tcp_orphan_retries = 0;
+        net->ipv4.sysctl_tcp_fin_timeout = TCP_FIN_TIMEOUT;
+        net->ipv4.sysctl_tcp_notsent_lowat = UINT_MAX;
+
         return 0;
 fail:
         tcp_sk_exit(net);