diff options
Diffstat (limited to 'net/bridge')
-rw-r--r-- | net/bridge/br_netfilter.c | 24 |
1 files changed, 5 insertions, 19 deletions
diff --git a/net/bridge/br_netfilter.c b/net/bridge/br_netfilter.c index 859fe4d86698..141f069e77a0 100644 --- a/net/bridge/br_netfilter.c +++ b/net/bridge/br_netfilter.c | |||
@@ -967,24 +967,10 @@ static ctl_table brnf_table[] = { | |||
967 | { .ctl_name = 0 } | 967 | { .ctl_name = 0 } |
968 | }; | 968 | }; |
969 | 969 | ||
970 | static ctl_table brnf_bridge_table[] = { | 970 | static struct ctl_path brnf_path[] = { |
971 | { | 971 | { .procname = "net", .ctl_name = CTL_NET, }, |
972 | .ctl_name = NET_BRIDGE, | 972 | { .procname = "bridge", .ctl_name = NET_BRIDGE, }, |
973 | .procname = "bridge", | 973 | { } |
974 | .mode = 0555, | ||
975 | .child = brnf_table, | ||
976 | }, | ||
977 | { .ctl_name = 0 } | ||
978 | }; | ||
979 | |||
980 | static ctl_table brnf_net_table[] = { | ||
981 | { | ||
982 | .ctl_name = CTL_NET, | ||
983 | .procname = "net", | ||
984 | .mode = 0555, | ||
985 | .child = brnf_bridge_table, | ||
986 | }, | ||
987 | { .ctl_name = 0 } | ||
988 | }; | 974 | }; |
989 | #endif | 975 | #endif |
990 | 976 | ||
@@ -996,7 +982,7 @@ int __init br_netfilter_init(void) | |||
996 | if (ret < 0) | 982 | if (ret < 0) |
997 | return ret; | 983 | return ret; |
998 | #ifdef CONFIG_SYSCTL | 984 | #ifdef CONFIG_SYSCTL |
999 | brnf_sysctl_header = register_sysctl_table(brnf_net_table); | 985 | brnf_sysctl_header = register_sysctl_paths(brnf_path, brnf_table); |
1000 | if (brnf_sysctl_header == NULL) { | 986 | if (brnf_sysctl_header == NULL) { |
1001 | printk(KERN_WARNING | 987 | printk(KERN_WARNING |
1002 | "br_netfilter: can't register to sysctl.\n"); | 988 | "br_netfilter: can't register to sysctl.\n"); |