iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[NETFILTER]: bridge-netfilter: use nf_register_hooks/nf_unregister_hooks

Browse Source 
Additionally mark the init function __init.

Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Patrick McHardy 2007-02-07 15:07:22 -08:00 committed by David S. Miller
parent efbc597634
commit 5eb87f456e
1 changed files with 7 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
net/bridge/br_netfilter.c
View File

@ -949,44 +949,29 @@ static ctl_table brnf_net_table[] = {
}; };
#endif #endif
int br_netfilter_init(void) int __init br_netfilter_init(void)
{ {
int i; int ret;
for (i = 0; i < ARRAY_SIZE(br_nf_ops); i++) {
int ret;
if ((ret = nf_register_hook(&br_nf_ops[i])) >= 0)
continue;
while (i--)
nf_unregister_hook(&br_nf_ops[i]);
ret = nf_register_hooks(br_nf_ops, ARRAY_SIZE(br_nf_ops));
if (ret < 0)
return ret; return ret;
}
#ifdef CONFIG_SYSCTL #ifdef CONFIG_SYSCTL
brnf_sysctl_header = register_sysctl_table(brnf_net_table, 0); brnf_sysctl_header = register_sysctl_table(brnf_net_table, 0);
if (brnf_sysctl_header == NULL) { if (brnf_sysctl_header == NULL) {
printk(KERN_WARNING printk(KERN_WARNING
"br_netfilter: can't register to sysctl.\n"); "br_netfilter: can't register to sysctl.\n");
for (i = 0; i < ARRAY_SIZE(br_nf_ops); i++) nf_unregister_hooks(br_nf_ops, ARRAY_SIZE(br_nf_ops));
nf_unregister_hook(&br_nf_ops[i]); return -ENOMEM;
return -EFAULT;
} }
#endif #endif
printk(KERN_NOTICE "Bridge firewalling registered\n"); printk(KERN_NOTICE "Bridge firewalling registered\n");
return 0; return 0;
} }
void br_netfilter_fini(void) void br_netfilter_fini(void)
{ {
int i; nf_unregister_hooks(br_nf_ops, ARRAY_SIZE(br_nf_ops));
for (i = ARRAY_SIZE(br_nf_ops) - 1; i >= 0; i--)
nf_unregister_hook(&br_nf_ops[i]);
#ifdef CONFIG_SYSCTL #ifdef CONFIG_SYSCTL
unregister_sysctl_table(brnf_sysctl_header); unregister_sysctl_table(brnf_sysctl_header);
#endif #endif