upgrade to fedora-2.6.12-1.1398.FC4 + vserver 2.0.rc7

[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 63c6254..47449ba 100644 (file)
--- a/net/ipv4/netfilter/iptable_raw.c
+++ b/net/ipv4/netfilter/iptable_raw.c
@@ -8,25 +8,6 @@
 
 #define RAW_VALID_HOOKS ((1 << NF_IP_PRE_ROUTING) | (1 << NF_IP_LOCAL_OUT))
 
-/* Standard entry. */
-struct ipt_standard
-{
-       struct ipt_entry entry;
-       struct ipt_standard_target target;
-};
-
-struct ipt_error_target
-{
-       struct ipt_entry_target target;
-       char errorname[IPT_FUNCTION_MAXNAMELEN];
-};
-
-struct ipt_error
-{
-       struct ipt_entry entry;
-       struct ipt_error_target target;
-};
-
 static struct
 {
        struct ipt_replace repl;
@@ -100,7 +81,6 @@ static struct
 
 static struct ipt_table packet_raw = { 
        .name = "raw", 
-       .table = &initial_table.repl,
        .valid_hooks =  RAW_VALID_HOOKS, 
        .lock = RW_LOCK_UNLOCKED, 
        .me = THIS_MODULE
@@ -123,13 +103,15 @@ static struct nf_hook_ops ipt_ops[] = {
          .hook = ipt_hook, 
          .pf = PF_INET, 
          .hooknum = NF_IP_PRE_ROUTING, 
-         .priority = NF_IP_PRI_RAW
+         .priority = NF_IP_PRI_RAW,
+         .owner = THIS_MODULE,
        },
        {
          .hook = ipt_hook, 
          .pf = PF_INET, 
          .hooknum = NF_IP_LOCAL_OUT, 
-         .priority = NF_IP_PRI_RAW
+         .priority = NF_IP_PRI_RAW,
+         .owner = THIS_MODULE,
        },
 };
 
@@ -138,7 +120,7 @@ static int __init init(void)
        int ret;
 
        /* Register table */
-       ret = ipt_register_table(&packet_raw);
+       ret = ipt_register_table(&packet_raw, &initial_table.repl);
        if (ret < 0)
                return ret;