Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-serial

[linux-2.6-omap-h63xx.git] / net / ipv6 / netfilter / ip6table_raw.c

diff --git a/net/ipv6/netfilter/ip6table_raw.c b/net/ipv6/netfilter/ip6table_raw.c
index 54d1fffd62bac61c354981c4ab992c49adfaff2f..61a7c58e99f88c72fe3dda967388820460da47e1 100644 (file)
--- 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);
 }