[NETFILTER]: bridge: remove broken netfilter binary sysctls

The netfilter sysctls in the bridging code don't set strategy routines:

 sysctl table check failed: /net/bridge/bridge-nf-call-arptables .3.10.1 Missing strategy
 sysctl table check failed: /net/bridge/bridge-nf-call-iptables .3.10.2 Missing strategy
 sysctl table check failed: /net/bridge/bridge-nf-call-ip6tables .3.10.3 Missing strategy
 sysctl table check failed: /net/bridge/bridge-nf-filter-vlan-tagged .3.10.4 Missing strategy
 sysctl table check failed: /net/bridge/bridge-nf-filter-pppoe-tagged .3.10.5 Missing strategy

    These binary sysctls can't work. The binary sysctl numbers of
other netfilter sysctls with this problem are being removed.  These
need to go as well.

Signed-off-by: Joseph Fannin <jfannin@gmail.com>
Acked-by: "Eric W. Biederman" <ebiederm@xmission.com>
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/bridge/br_netfilter.c b/net/bridge/br_netfilter.c
index fc13130035e73997dbe5efb95ef3a02f3bd02b0d..8245f051ccbbcb63f95755f663c1503f0cc954b9 100644 (file)
--- a/net/bridge/br_netfilter.c
+++ b/net/bridge/br_netfilter.c
@@ -904,7 +904,6 @@ int brnf_sysctl_call_tables(ctl_table * ctl, int write, struct file *filp,
 
 static ctl_table brnf_table[] = {
        {
-               .ctl_name       = NET_BRIDGE_NF_CALL_ARPTABLES,
                .procname       = "bridge-nf-call-arptables",
                .data           = &brnf_call_arptables,
                .maxlen         = sizeof(int),
@@ -912,7 +911,6 @@ static ctl_table brnf_table[] = {
                .proc_handler   = &brnf_sysctl_call_tables,
        },
        {
-               .ctl_name       = NET_BRIDGE_NF_CALL_IPTABLES,
                .procname       = "bridge-nf-call-iptables",
                .data           = &brnf_call_iptables,
                .maxlen         = sizeof(int),
@@ -920,7 +918,6 @@ static ctl_table brnf_table[] = {
                .proc_handler   = &brnf_sysctl_call_tables,
        },
        {
-               .ctl_name       = NET_BRIDGE_NF_CALL_IP6TABLES,
                .procname       = "bridge-nf-call-ip6tables",
                .data           = &brnf_call_ip6tables,
                .maxlen         = sizeof(int),
@@ -928,7 +925,6 @@ static ctl_table brnf_table[] = {
                .proc_handler   = &brnf_sysctl_call_tables,
        },
        {
-               .ctl_name       = NET_BRIDGE_NF_FILTER_VLAN_TAGGED,
                .procname       = "bridge-nf-filter-vlan-tagged",
                .data           = &brnf_filter_vlan_tagged,
                .maxlen         = sizeof(int),
@@ -936,7 +932,6 @@ static ctl_table brnf_table[] = {
                .proc_handler   = &brnf_sysctl_call_tables,
        },
        {
-               .ctl_name       = NET_BRIDGE_NF_FILTER_PPPOE_TAGGED,
                .procname       = "bridge-nf-filter-pppoe-tagged",
                .data           = &brnf_filter_pppoe_tagged,
                .maxlen         = sizeof(int),