commit 31ad3dd64e689bc79dd819f8f134b9b025240eb8
author Florian Westphal <fw@strlen.de> Mon Apr 04 16:56:29 2011 +0200
committer Patrick McHardy <kaber@trash.net> Mon Apr 04 16:56:29 2011 +0200
tree 06d2a9afbea2b1b7973e416f18d4588df30fb91a
parent a09d19779f3ffac6e16821accc2c1cc4df1b643a

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>

net/ipv6/netfilter.c

diff --git a/net/ipv6/netfilter.c b/net/ipv6/netfilter.c
index 39aaca2..e008b9b 100644
--- a/net/ipv6/netfilter.c
+++ b/net/ipv6/netfilter.c
@@ -90,9 +90,10 @@
 	return 0;
 }
 
-static int nf_ip6_route(struct dst_entry **dst, struct flowi *fl)
+static int nf_ip6_route(struct net *net, struct dst_entry **dst,
+			struct flowi *fl)
 {
-	*dst = ip6_route_output(&init_net, NULL, &fl->u.ip6);
+	*dst = ip6_route_output(net, NULL, &fl->u.ip6);
 	return (*dst)->error;
 }