diff options
author | Florian Westphal <fw@strlen.de> | 2011-04-04 10:56:29 -0400 |
---|---|---|
committer | Patrick McHardy <kaber@trash.net> | 2011-04-04 10:56:29 -0400 |
commit | 31ad3dd64e689bc79dd819f8f134b9b025240eb8 (patch) | |
tree | 06d2a9afbea2b1b7973e416f18d4588df30fb91a /net/ipv6 | |
parent | a09d19779f3ffac6e16821accc2c1cc4df1b643a (diff) |
netfilter: af_info: add network namespace parameter to route hook
This is required to eventually replace the rt6_lookup call in
xt_addrtype.c with nf_afinfo->route().
Signed-off-by: Florian Westphal <fw@strlen.de>
Acked-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Patrick McHardy <kaber@trash.net>
Diffstat (limited to 'net/ipv6')
-rw-r--r-- | net/ipv6/netfilter.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/net/ipv6/netfilter.c b/net/ipv6/netfilter.c index 39aaca2b4fd2..e008b9b4a779 100644 --- a/net/ipv6/netfilter.c +++ b/net/ipv6/netfilter.c | |||
@@ -90,9 +90,10 @@ static int nf_ip6_reroute(struct sk_buff *skb, | |||
90 | return 0; | 90 | return 0; |
91 | } | 91 | } |
92 | 92 | ||
93 | static int nf_ip6_route(struct dst_entry **dst, struct flowi *fl) | 93 | static int nf_ip6_route(struct net *net, struct dst_entry **dst, |
94 | struct flowi *fl) | ||
94 | { | 95 | { |
95 | *dst = ip6_route_output(&init_net, NULL, &fl->u.ip6); | 96 | *dst = ip6_route_output(net, NULL, &fl->u.ip6); |
96 | return (*dst)->error; | 97 | return (*dst)->error; |
97 | } | 98 | } |
98 | 99 | ||