diff options
| author | Nikolay Borisov <kernel@kyup.com> | 2016-02-15 12:11:28 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-02-16 20:42:54 -0500 |
| commit | dcd87999d415d39cf2ae510bfed6b8206d778e1c (patch) | |
| tree | 09e9faac10dbe5ae9d4ab503add767de9a8a5e28 /net/ipv4/tcp_ipv4.c | |
| parent | fa50d974d104113630d68b7d03233a6686230d0c (diff) | |
| download | linux-dcd87999d415d39cf2ae510bfed6b8206d778e1c.tar.gz linux-dcd87999d415d39cf2ae510bfed6b8206d778e1c.tar.bz2 linux-dcd87999d415d39cf2ae510bfed6b8206d778e1c.zip | |
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.c | 6 |
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) net->ipv4.sysctl_tcp_fin_timeout = TCP_FIN_TIMEOUT; net->ipv4.sysctl_tcp_notsent_lowat = UINT_MAX; - net->ipv4.sysctl_igmp_max_memberships = 20; - net->ipv4.sysctl_igmp_max_msf = 10; - /* IGMP reports for link-local multicast groups are enabled by default */ - net->ipv4.sysctl_igmp_llm_reports = 1; - net->ipv4.sysctl_igmp_qrv = 2; - return 0; fail: tcp_sk_exit(net); |