aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv6/ip6_output.c
diff options
context:
space:
mode:
authorDaniel Lezcano <dlezcano@fr.ibm.com>2008-03-05 13:48:10 -0500
committerDavid S. Miller <davem@davemloft.net>2008-03-05 13:48:10 -0500
commit4591db4f37618f37a9f1f25d291c3c7a43a15a21 (patch)
tree10694d610a78d8cc607fcb2998e4dc97856138f6 /net/ipv6/ip6_output.c
parent6fda73500581be531fd9bc232173332ec64f6435 (diff)
[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.c4
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,
913 int err; 913 int err;
914 914
915 if (*dst == NULL) 915 if (*dst == NULL)
916 *dst = ip6_route_output(sk, fl); 916 *dst = ip6_route_output(&init_net, sk, fl);
917 917
918 if ((err = (*dst)->error)) 918 if ((err = (*dst)->error))
919 goto out_err_release; 919 goto out_err_release;
@@ -954,7 +954,7 @@ static int ip6_dst_lookup_tail(struct sock *sk,
954 dst_release(*dst); 954 dst_release(*dst);
955 memcpy(&fl_gw, fl, sizeof(struct flowi)); 955 memcpy(&fl_gw, fl, sizeof(struct flowi));
956 memset(&fl_gw.fl6_dst, 0, sizeof(struct in6_addr)); 956 memset(&fl_gw.fl6_dst, 0, sizeof(struct in6_addr));
957 *dst = ip6_route_output(sk, &fl_gw); 957 *dst = ip6_route_output(&init_net, sk, &fl_gw);
958 if ((err = (*dst)->error)) 958 if ((err = (*dst)->error))
959 goto out_err_release; 959 goto out_err_release;
960 } 960 }