aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv4/tcp_ipv4.c
diff options
context:
space:
mode:
authorNikolay Borisov <kernel@kyup.com>2016-02-15 05:11:28 -0500
committerDavid S. Miller <davem@davemloft.net>2016-02-16 20:42:54 -0500
commitdcd87999d415d39cf2ae510bfed6b8206d778e1c (patch)
tree09e9faac10dbe5ae9d4ab503add767de9a8a5e28 /net/ipv4/tcp_ipv4.c
parentfa50d974d104113630d68b7d03233a6686230d0c (diff)
igmp: net: Move igmp namespace init to correct file
When igmp related sysctl were namespacified their initializatin was erroneously put into the tcp socket namespace constructor. This patch moves the relevant code into the igmp namespace constructor to keep things consistent. Also sprinkle some #ifdefs to silence warnings Signed-off-by: Nikolay Borisov <kernel@kyup.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/tcp_ipv4.c')
-rw-r--r--net/ipv4/tcp_ipv4.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c
index ba5d0146e3f0..3f872a6bc274 100644
--- a/net/ipv4/tcp_ipv4.c
+++ b/net/ipv4/tcp_ipv4.c
@@ -2399,12 +2399,6 @@ static int __net_init tcp_sk_init(struct net *net)
2399 net->ipv4.sysctl_tcp_fin_timeout = TCP_FIN_TIMEOUT; 2399 net->ipv4.sysctl_tcp_fin_timeout = TCP_FIN_TIMEOUT;
2400 net->ipv4.sysctl_tcp_notsent_lowat = UINT_MAX; 2400 net->ipv4.sysctl_tcp_notsent_lowat = UINT_MAX;
2401 2401
2402 net->ipv4.sysctl_igmp_max_memberships = 20;
2403 net->ipv4.sysctl_igmp_max_msf = 10;
2404 /* IGMP reports for link-local multicast groups are enabled by default */
2405 net->ipv4.sysctl_igmp_llm_reports = 1;
2406 net->ipv4.sysctl_igmp_qrv = 2;
2407
2408 return 0; 2402 return 0;
2409fail: 2403fail:
2410 tcp_sk_exit(net); 2404 tcp_sk_exit(net);