Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff

[linux-2.6.git] / net / ipv4 / netfilter / iptable_raw.c

diff --git a/net/ipv4/netfilter/iptable_raw.c b/net/ipv4/netfilter/iptable_raw.c
index 47449ba..7912cce 100644 (file)
--- a/net/ipv4/netfilter/iptable_raw.c
+++ b/net/ipv4/netfilter/iptable_raw.c
@@ -83,7 +83,8 @@ static struct ipt_table packet_raw = {
        .name = "raw", 
        .valid_hooks =  RAW_VALID_HOOKS, 
        .lock = RW_LOCK_UNLOCKED, 
-       .me = THIS_MODULE
+       .me = THIS_MODULE,
+       .af = AF_INET,
 };
 
 /* The work comes in here from netfilter.c. */
@@ -100,22 +101,22 @@ ipt_hook(unsigned int hook,
 /* 'raw' is the very first table. */
 static struct nf_hook_ops ipt_ops[] = {
        {
-         .hook = ipt_hook, 
-         .pf = PF_INET, 
-         .hooknum = NF_IP_PRE_ROUTING, 
-         .priority = NF_IP_PRI_RAW,
-         .owner = THIS_MODULE,
+               .hook = ipt_hook,
+               .pf = PF_INET,
+               .hooknum = NF_IP_PRE_ROUTING,
+               .priority = NF_IP_PRI_RAW,
+               .owner = THIS_MODULE,
        },
        {
-         .hook = ipt_hook, 
-         .pf = PF_INET, 
-         .hooknum = NF_IP_LOCAL_OUT, 
-         .priority = NF_IP_PRI_RAW,
-         .owner = THIS_MODULE,
+               .hook = ipt_hook,
+               .pf = PF_INET,
+               .hooknum = NF_IP_LOCAL_OUT,
+               .priority = NF_IP_PRI_RAW,
+               .owner = THIS_MODULE,
        },
 };
 
-static int __init init(void)
+static int __init iptable_raw_init(void)
 {
        int ret;
 
@@ -125,34 +126,23 @@ static int __init init(void)
                return ret;
 
        /* Register hooks */
-       ret = nf_register_hook(&ipt_ops[0]);
+       ret = nf_register_hooks(ipt_ops, ARRAY_SIZE(ipt_ops));
        if (ret < 0)
                goto cleanup_table;
 
-       ret = nf_register_hook(&ipt_ops[1]);
-       if (ret < 0)
-               goto cleanup_hook0;
-
        return ret;
 
- cleanup_hook0:
-       nf_unregister_hook(&ipt_ops[0]);
  cleanup_table:
        ipt_unregister_table(&packet_raw);
-
        return ret;
 }
 
-static void __exit fini(void)
+static void __exit iptable_raw_fini(void)
 {
-       unsigned int i;
-
-       for (i = 0; i < sizeof(ipt_ops)/sizeof(struct nf_hook_ops); i++)
-               nf_unregister_hook(&ipt_ops[i]);
-
+       nf_unregister_hooks(ipt_ops, ARRAY_SIZE(ipt_ops));
        ipt_unregister_table(&packet_raw);
 }
 
-module_init(init);
-module_exit(fini);
+module_init(iptable_raw_init);
+module_exit(iptable_raw_fini);
 MODULE_LICENSE("GPL");