diff options
| author | David S. Miller <davem@davemloft.net> | 2011-04-19 00:21:33 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-04-19 00:21:33 -0700 |
| commit | e1943424e43974f85b82bb31eaf832823bf49ce7 (patch) | |
| tree | 00a2dda7454ba186c0be4bfb8d08b7f74c3cd98c /net/ipv4/sysctl_net_ipv4.c | |
| parent | 88230fd586b4ccc5ffe6d6c2df8cdc495e89ad83 (diff) | |
| parent | 0553c891fabd287726b41076cfd03fe7e5ab596f (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/bnx2x/bnx2x_ethtool.c
Diffstat (limited to 'net/ipv4/sysctl_net_ipv4.c')
| -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, |