Merge branch 'linus' into x86/memory-corruption-check

[linux-2.6-omap-h63xx.git] / net / ipv4 / netfilter / iptable_security.c

diff --git a/net/ipv4/netfilter/iptable_security.c b/net/ipv4/netfilter/iptable_security.c
index 2b472ac2263a612a3d6776764abd1410e1a7ed01..36f3be3cc4285ece3804fbabecc6e238fdd6756e 100644 (file)
--- a/net/ipv4/netfilter/iptable_security.c
+++ b/net/ipv4/netfilter/iptable_security.c
@@ -32,7 +32,7 @@ static struct
        struct ipt_replace repl;
        struct ipt_standard entries[3];
        struct ipt_error term;
-} initial_table __initdata = {
+} initial_table __net_initdata = {
        .repl = {
                .name = "security",
                .valid_hooks = SECURITY_VALID_HOOKS,
@@ -73,7 +73,7 @@ ipt_local_in_hook(unsigned int hook,
                  int (*okfn)(struct sk_buff *))
 {
        return ipt_do_table(skb, hook, in, out,
-                           nf_local_in_net(in, out)->ipv4.iptable_security);
+                           dev_net(in)->ipv4.iptable_security);
 }
 
 static unsigned int
@@ -84,7 +84,7 @@ ipt_forward_hook(unsigned int hook,
                 int (*okfn)(struct sk_buff *))
 {
        return ipt_do_table(skb, hook, in, out,
-                           nf_forward_net(in, out)->ipv4.iptable_security);
+                           dev_net(in)->ipv4.iptable_security);
 }
 
 static unsigned int
@@ -103,7 +103,7 @@ ipt_local_out_hook(unsigned int hook,
                return NF_ACCEPT;
        }
        return ipt_do_table(skb, hook, in, out,
-                           nf_local_out_net(in, out)->ipv4.iptable_security);
+                           dev_net(out)->ipv4.iptable_security);
 }
 
 static struct nf_hook_ops ipt_ops[] __read_mostly = {