From 2fe2d43348adaa995ba4b4e4c923dc0adf74b959 Mon Sep 17 00:00:00 2001 From: Alexey Dobriyan Date: Tue, 8 Jul 2008 02:34:52 -0700 Subject: [PATCH] --- yaml --- r: 103320 b: refs/heads/master c: d2789312cc6d875462d1d248e07a8a9caf8a6ae3 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/ipv6/netfilter/ip6table_security.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 137b77b55ca2..f861e04746b8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6ba33ac8a47d33d0b5996d24ddf66c457cd7180b +refs/heads/master: d2789312cc6d875462d1d248e07a8a9caf8a6ae3 diff --git a/trunk/net/ipv6/netfilter/ip6table_security.c b/trunk/net/ipv6/netfilter/ip6table_security.c index 063a3d9c3c67..a07abee30497 100644 --- a/trunk/net/ipv6/netfilter/ip6table_security.c +++ b/trunk/net/ipv6/netfilter/ip6table_security.c @@ -72,7 +72,7 @@ ip6t_local_in_hook(unsigned int hook, int (*okfn)(struct sk_buff *)) { return ip6t_do_table(skb, hook, in, out, - init_net.ipv6.ip6table_security); + nf_local_in_net(in, out)->ipv6.ip6table_security); } static unsigned int @@ -83,7 +83,7 @@ ip6t_forward_hook(unsigned int hook, int (*okfn)(struct sk_buff *)) { return ip6t_do_table(skb, hook, in, out, - init_net.ipv6.ip6table_security); + nf_forward_net(in, out)->ipv6.ip6table_security); } static unsigned int @@ -95,7 +95,7 @@ ip6t_local_out_hook(unsigned int hook, { /* TBD: handle short packets via raw socket */ return ip6t_do_table(skb, hook, in, out, - init_net.ipv6.ip6table_security); + nf_local_out_net(in, out)->ipv6.ip6table_security); } static struct nf_hook_ops ip6t_ops[] __read_mostly = {