diff options
author | Alex Shi <alex.shi@linaro.org> | 2017-08-14 12:01:51 +0800 |
---|---|---|
committer | Alex Shi <alex.shi@linaro.org> | 2017-08-14 12:01:51 +0800 |
commit | 5d296e2cec6ebbb062829078ffcd36a205c9b293 (patch) | |
tree | bd83b344c43d728e61c72fa8975fdf41a4ec89ee /net/ipv4/igmp.c | |
parent | 13f1b95e47853fd2b7f25ff198bef38124b24959 (diff) | |
parent | 6da35f43acde8f718b53f6f05fc865bffa709fc5 (diff) |
Merge tag 'v4.9.43' into linux-linaro-lsk-v4.9
This is the 4.9.43 stable release
Diffstat (limited to 'net/ipv4/igmp.c')
-rw-r--r-- | net/ipv4/igmp.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/net/ipv4/igmp.c b/net/ipv4/igmp.c index 19930da56b0a..08575e3bd135 100644 --- a/net/ipv4/igmp.c +++ b/net/ipv4/igmp.c @@ -2974,12 +2974,6 @@ static int __net_init igmp_net_init(struct net *net) goto out_sock; } - /* Sysctl initialization */ - 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; out_sock: |