diff options
| author |   Daniel Lezcano <dlezcano@fr.ibm.com> | 2008-03-05 10:48:10 -0800 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2008-03-05 10:48:10 -0800 |
| commit | 4591db4f37618f37a9f1f25d291c3c7a43a15a21 (patch) | |
| tree | 10694d610a78d8cc607fcb2998e4dc97856138f6 /net/ipv6/netfilter.c | |
| parent | [NETNS][IPV6] addrconf - make addrconf per namespace (diff) | |
| download | linux-dev-4591db4f37618f37a9f1f25d291c3c7a43a15a21.tar.xz linux-dev-4591db4f37618f37a9f1f25d291c3c7a43a15a21.zip | |
[NETNS][IPV6] route6 - add netns parameter to ip6_route_output
Add an netns parameter to ip6_route_output. That will allow to access
to the right routing table for outgoing traffic.
Signed-off-by: Daniel Lezcano <dlezcano@fr.ibm.com>
Signed-off-by: Benjamin Thery <benjamin.thery@bull.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/netfilter.c')
| -rw-r--r-- | net/ipv6/netfilter.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv6/netfilter.c b/net/ipv6/netfilter.c index 2e06724dc348..aed51bcc66b4 100644 --- a/net/ipv6/netfilter.c +++ b/net/ipv6/netfilter.c @@ -23,7 +23,7 @@ int ip6_route_me_harder(struct sk_buff *skb) .saddr = iph->saddr, } }, }; - dst = ip6_route_output(skb->sk, &fl); + dst = ip6_route_output(&init_net, skb->sk, &fl); #ifdef CONFIG_XFRM if (!(IP6CB(skb)->flags & IP6SKB_XFRM_TRANSFORMED) && @@ -86,7 +86,7 @@ static int nf_ip6_reroute(struct sk_buff *skb, static int nf_ip6_route(struct dst_entry **dst, struct flowi *fl) { - *dst = ip6_route_output(NULL, fl); + *dst = ip6_route_output(&init_net, NULL, fl); return (*dst)->error; } |