diff options
| author |   Patrick McHardy <kaber@trash.net> | 2006-04-06 14:09:49 -0700 |
|---|---|---|
| committer |   David S. Miller <davem@sunset.davemloft.net> | 2006-04-09 22:25:33 -0700 |
| commit | 964ddaa10de8f3aeed12bc2a30726514ff309e64 (patch) | |
| tree | 4cda0dcd4d5ec2bf8f06cd4375be4251e96c6a16 /net/ipv6/netfilter/ip6table_raw.c | |
| parent | [NETFILTER]: Add helper functions for mass hook registration/unregistration (diff) | |
| download | linux-dev-964ddaa10de8f3aeed12bc2a30726514ff309e64.tar.xz linux-dev-964ddaa10de8f3aeed12bc2a30726514ff309e64.zip | |
[NETFILTER]: Clean up hook registration
Clean up hook registration by makeing use of the new mass registration and
unregistration helpers.
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/netfilter/ip6table_raw.c')
| -rw-r--r-- | net/ipv6/netfilter/ip6table_raw.c | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/net/ipv6/netfilter/ip6table_raw.c b/net/ipv6/netfilter/ip6table_raw.c index 54d1fffd62ba..61a7c58e99f8 100644 --- a/net/ipv6/netfilter/ip6table_raw.c +++ b/net/ipv6/netfilter/ip6table_raw.c @@ -152,31 +152,20 @@ static int __init ip6table_raw_init(void) return ret; /* Register hooks */ - ret = nf_register_hook(&ip6t_ops[0]); + ret = nf_register_hooks(ip6t_ops, ARRAY_SIZE(ip6t_ops)); if (ret < 0) goto cleanup_table; - ret = nf_register_hook(&ip6t_ops[1]); - if (ret < 0) - goto cleanup_hook0; - return ret; - cleanup_hook0: - nf_unregister_hook(&ip6t_ops[0]); cleanup_table: ip6t_unregister_table(&packet_raw); - return ret; } static void __exit ip6table_raw_fini(void) { - unsigned int i; - - for (i = 0; i < sizeof(ip6t_ops)/sizeof(struct nf_hook_ops); i++) - nf_unregister_hook(&ip6t_ops[i]); - + nf_unregister_hooks(ip6t_ops, ARRAY_SIZE(ip6t_ops)); ip6t_unregister_table(&packet_raw); } |