diff options
| author |   Florian Westphal <fw@strlen.de> | 2011-04-04 16:56:29 +0200 |
|---|---|---|
| committer |   Patrick McHardy <kaber@trash.net> | 2011-04-04 16:56:29 +0200 |
| commit | 31ad3dd64e689bc79dd819f8f134b9b025240eb8 (patch) | |
| tree | 06d2a9afbea2b1b7973e416f18d4588df30fb91a /net/ipv6/netfilter.c | |
| parent | IPVS: fix NULL ptr dereference in ip_vs_ctl.c ip_vs_genl_dump_daemons() (diff) | |
| download | linux-dev-31ad3dd64e689bc79dd819f8f134b9b025240eb8.tar.xz linux-dev-31ad3dd64e689bc79dd819f8f134b9b025240eb8.zip | |
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/netfilter.c')
| -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, 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; } |