aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv4
diff options
context:
space:
mode:
authorJoakim Tjernlund <Joakim.Tjernlund@transmode.se>2011-04-12 13:59:33 -0700
committerDavid S. Miller <davem@davemloft.net>2011-04-12 13:59:33 -0700
commit192910a6cca5e50e5bd6cbd1da0e7376c7adfe62 (patch)
treec7638554eb015ac8a1306d6916c047adc164e960 /net/ipv4
parent66944e1c5797562cebe2d1857d46dff60bf9a69e (diff)
downloadkernel_samsung_crespo-192910a6cca5e50e5bd6cbd1da0e7376c7adfe62.zip
kernel_samsung_crespo-192910a6cca5e50e5bd6cbd1da0e7376c7adfe62.tar.gz
kernel_samsung_crespo-192910a6cca5e50e5bd6cbd1da0e7376c7adfe62.tar.bz2
net: Do not wrap sysctl igmp_max_memberships in IP_MULTICAST
controlling igmp_max_membership is useful even when IP_MULTICAST is off. Quagga(an OSPF deamon) uses multicast addresses for all interfaces using a single socket and hits igmp_max_membership limit when there are 20 interfaces or more. Always export sysctl igmp_max_memberships in proc, just like igmp_max_msf Signed-off-by: Joakim Tjernlund <Joakim.Tjernlund@transmode.se> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4')
-rw-r--r--net/ipv4/sysctl_net_ipv4.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/net/ipv4/sysctl_net_ipv4.c b/net/ipv4/sysctl_net_ipv4.c
index 1a45665..321e6e8 100644
--- a/net/ipv4/sysctl_net_ipv4.c
+++ b/net/ipv4/sysctl_net_ipv4.c
@@ -311,7 +311,6 @@ static struct ctl_table ipv4_table[] = {
.mode = 0644,
.proc_handler = proc_do_large_bitmap,
},
-#ifdef CONFIG_IP_MULTICAST
{
.procname = "igmp_max_memberships",
.data = &sysctl_igmp_max_memberships,
@@ -319,8 +318,6 @@ static struct ctl_table ipv4_table[] = {
.mode = 0644,
.proc_handler = proc_dointvec
},
-
-#endif
{
.procname = "igmp_max_msf",
.data = &sysctl_igmp_max_msf,