diff options
| author | Joakim Tjernlund <Joakim.Tjernlund@transmode.se> | 2011-04-12 13:59:33 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-06-03 10:33:57 +0900 |
| commit | 2e14c286d94922cd9f4bf3a2cb110ae0f24f9d85 (patch) | |
| tree | b8f377f9a6ff55c2fd6ce6412d4925349dc0b298 | |
| parent | 39d073d0ce6fb9c45bbaeb314100c92c0c350552 (diff) | |
| download | lwn-2e14c286d94922cd9f4bf3a2cb110ae0f24f9d85.tar.gz lwn-2e14c286d94922cd9f4bf3a2cb110ae0f24f9d85.zip | |
net: Do not wrap sysctl igmp_max_memberships in IP_MULTICAST
[ Upstream commit 192910a6cca5e50e5bd6cbd1da0e7376c7adfe62 ]
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>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| -rw-r--r-- | net/ipv4/sysctl_net_ipv4.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/net/ipv4/sysctl_net_ipv4.c b/net/ipv4/sysctl_net_ipv4.c index 1a456652086b..321e6e84dbcc 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, |