diff options
author | Daniel Lezcano <dlezcano@fr.ibm.com> | 2008-03-05 19:48:10 +0100 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-03-05 19:48:10 +0100 |
commit | 4591db4f37618f37a9f1f25d291c3c7a43a15a21 (patch) | |
tree | 10694d610a78d8cc607fcb2998e4dc97856138f6 /net/ipv6/ip6_output.c | |
parent | [NETNS][IPV6] addrconf - make addrconf per namespace (diff) | |
download | linux-4591db4f37618f37a9f1f25d291c3c7a43a15a21.tar.xz linux-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/ip6_output.c')
-rw-r--r-- | net/ipv6/ip6_output.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv6/ip6_output.c b/net/ipv6/ip6_output.c index ff3971173e1e..161afd1142d0 100644 --- a/net/ipv6/ip6_output.c +++ b/net/ipv6/ip6_output.c @@ -913,7 +913,7 @@ static int ip6_dst_lookup_tail(struct sock *sk, int err; if (*dst == NULL) - *dst = ip6_route_output(sk, fl); + *dst = ip6_route_output(&init_net, sk, fl); if ((err = (*dst)->error)) goto out_err_release; @@ -954,7 +954,7 @@ static int ip6_dst_lookup_tail(struct sock *sk, dst_release(*dst); memcpy(&fl_gw, fl, sizeof(struct flowi)); memset(&fl_gw.fl6_dst, 0, sizeof(struct in6_addr)); - *dst = ip6_route_output(sk, &fl_gw); + *dst = ip6_route_output(&init_net, sk, &fl_gw); if ((err = (*dst)->error)) goto out_err_release; } |