diff options
| author |   Eric W. Biederman <ebiederm@xmission.com> | 2012-04-19 13:44:49 +0000 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2012-04-20 21:22:30 -0400 |
| commit | ec8f23ce0f4005b74013d4d122e0d540397a93c9 (patch) | |
| tree | c2f22aa08ad4c0197d3cb41b91cf8d436794fde1 /net/bridge | |
| parent | net: Convert nf_conntrack_proto to use register_net_sysctl (diff) | |
| download | linux-dev-ec8f23ce0f4005b74013d4d122e0d540397a93c9.tar.xz linux-dev-ec8f23ce0f4005b74013d4d122e0d540397a93c9.zip | |
net: Convert all sysctl registrations to register_net_sysctl
This results in code with less boiler plate that is a bit easier
to read.
Additionally stops us from using compatibility code in the sysctl
core, hastening the day when the compatibility code can be removed.
Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
Acked-by: Pavel Emelyanov <xemul@parallels.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/bridge')
| -rw-r--r-- | net/bridge/br_netfilter.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/net/bridge/br_netfilter.c b/net/bridge/br_netfilter.c index 4f4c4a619f68..9d4f09c3520f 100644 --- a/net/bridge/br_netfilter.c +++ b/net/bridge/br_netfilter.c @@ -1008,12 +1008,6 @@ static ctl_table brnf_table[] = { }, { } }; - -static struct ctl_path brnf_path[] = { - { .procname = "net", }, - { .procname = "bridge", }, - { } -}; #endif int __init br_netfilter_init(void) @@ -1030,7 +1024,7 @@ int __init br_netfilter_init(void) return ret; } #ifdef CONFIG_SYSCTL - brnf_sysctl_header = register_net_sysctl_table(&init_net, brnf_path, brnf_table); + brnf_sysctl_header = register_net_sysctl(&init_net, "net/bridge", brnf_table); if (brnf_sysctl_header == NULL) { printk(KERN_WARNING "br_netfilter: can't register to sysctl.\n"); |