Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6

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

diff --git a/net/ipv4/netfilter/iptable_raw.c b/net/ipv4/netfilter/iptable_raw.c
index dc34aa274533b8d5893fd6d4bd3642a003c19e28..fddce7754b7250d5f3087840f31f1aa27748a9a1 100644 (file)
--- a/net/ipv4/netfilter/iptable_raw.c
+++ b/net/ipv4/netfilter/iptable_raw.c
@@ -14,7 +14,7 @@ static struct
        struct ipt_replace repl;
        struct ipt_standard entries[2];
        struct ipt_error term;
-} initial_table __initdata = {
+} initial_table __net_initdata = {
        .repl = {
                .name = "raw",
                .valid_hooks = RAW_VALID_HOOKS,
@@ -39,7 +39,7 @@ static struct
 static struct xt_table packet_raw = {
        .name = "raw",
        .valid_hooks =  RAW_VALID_HOOKS,
-       .lock = RW_LOCK_UNLOCKED,
+       .lock = __RW_LOCK_UNLOCKED(packet_raw.lock),
        .me = THIS_MODULE,
        .af = AF_INET,
 };
@@ -52,7 +52,8 @@ ipt_hook(unsigned int hook,
         const struct net_device *out,
         int (*okfn)(struct sk_buff *))
 {
-       return ipt_do_table(skb, hook, in, out, &packet_raw);
+       return ipt_do_table(skb, hook, in, out,
+                           nf_pre_routing_net(in, out)->ipv4.iptable_raw);
 }
 
 static unsigned int
@@ -70,7 +71,8 @@ ipt_local_hook(unsigned int hook,
                               "packet.\n");
                return NF_ACCEPT;
        }
-       return ipt_do_table(skb, hook, in, out, &packet_raw);
+       return ipt_do_table(skb, hook, in, out,
+                           nf_local_out_net(in, out)->ipv4.iptable_raw);
 }
 
 /* 'raw' is the very first table. */
@@ -91,12 +93,31 @@ static struct nf_hook_ops ipt_ops[] __read_mostly = {
        },
 };
 
+static int __net_init iptable_raw_net_init(struct net *net)
+{
+       /* Register table */
+       net->ipv4.iptable_raw =
+               ipt_register_table(net, &packet_raw, &initial_table.repl);
+       if (IS_ERR(net->ipv4.iptable_raw))
+               return PTR_ERR(net->ipv4.iptable_raw);
+       return 0;
+}
+
+static void __net_exit iptable_raw_net_exit(struct net *net)
+{
+       ipt_unregister_table(net->ipv4.iptable_raw);
+}
+
+static struct pernet_operations iptable_raw_net_ops = {
+       .init = iptable_raw_net_init,
+       .exit = iptable_raw_net_exit,
+};
+
 static int __init iptable_raw_init(void)
 {
        int ret;
 
-       /* Register table */
-       ret = ipt_register_table(&packet_raw, &initial_table.repl);
+       ret = register_pernet_subsys(&iptable_raw_net_ops);
        if (ret < 0)
                return ret;
 
@@ -108,14 +129,14 @@ static int __init iptable_raw_init(void)
        return ret;
 
  cleanup_table:
-       ipt_unregister_table(&packet_raw);
+       unregister_pernet_subsys(&iptable_raw_net_ops);
        return ret;
 }
 
 static void __exit iptable_raw_fini(void)
 {
        nf_unregister_hooks(ipt_ops, ARRAY_SIZE(ipt_ops));
-       ipt_unregister_table(&packet_raw);
+       unregister_pernet_subsys(&iptable_raw_net_ops);
 }
 
 module_init(iptable_raw_init);