fedora core 6 1.2949 + vserver 2.2.0

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

diff --git a/net/ipv6/netfilter/ip6table_raw.c b/net/ipv6/netfilter/ip6table_raw.c
index db28ba3..b4154da 100644 (file)
--- a/net/ipv6/netfilter/ip6table_raw.c
+++ b/net/ipv6/netfilter/ip6table_raw.c
@@ -122,7 +122,7 @@ ip6t_hook(unsigned int hook,
         const struct net_device *out,
         int (*okfn)(struct sk_buff *))
 {
-       return ip6t_do_table(pskb, hook, in, out, &packet_raw, NULL);
+       return ip6t_do_table(pskb, hook, in, out, &packet_raw);
 }
 
 static struct nf_hook_ops ip6t_ops[] = { 
@@ -142,7 +142,7 @@ static struct nf_hook_ops ip6t_ops[] = {
        },
 };
 
-static int __init init(void)
+static int __init ip6table_raw_init(void)
 {
        int ret;
 
@@ -152,34 +152,23 @@ static int __init 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 fini(void)
+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);
 }
 
-module_init(init);
-module_exit(fini);
+module_init(ip6table_raw_init);
+module_exit(ip6table_raw_fini);
 MODULE_LICENSE("GPL");