aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv6/sit.c
diff options
context:
space:
mode:
authorDenis V. Lunev <den@openvz.org>2008-01-23 01:07:34 -0500
committerDavid S. Miller <davem@davemloft.net>2008-01-28 18:11:07 -0500
commitf206351a50ea86250fabea96b9af8d8f8fc02603 (patch)
tree014148d8b45db1995d98374ec3b30e635f243197 /net/ipv6/sit.c
parentf1b050bf7a88910f9f00c9c8989c1bf5a67dd140 (diff)
[NETNS]: Add namespace parameter to ip_route_output_key.
Needed to propagate it down to the ip_route_output_flow. Signed-off-by: Denis V. Lunev <den@openvz.org> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/sit.c')
-rw-r--r--net/ipv6/sit.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv6/sit.c b/net/ipv6/sit.c
index 1c6fddb80b37..e77239d02bf5 100644
--- a/net/ipv6/sit.c
+++ b/net/ipv6/sit.c
@@ -557,7 +557,7 @@ static int ipip6_tunnel_xmit(struct sk_buff *skb, struct net_device *dev)
557 .tos = RT_TOS(tos) } }, 557 .tos = RT_TOS(tos) } },
558 .oif = tunnel->parms.link, 558 .oif = tunnel->parms.link,
559 .proto = IPPROTO_IPV6 }; 559 .proto = IPPROTO_IPV6 };
560 if (ip_route_output_key(&rt, &fl)) { 560 if (ip_route_output_key(&init_net, &rt, &fl)) {
561 tunnel->stat.tx_carrier_errors++; 561 tunnel->stat.tx_carrier_errors++;
562 goto tx_error_icmp; 562 goto tx_error_icmp;
563 } 563 }
@@ -686,7 +686,7 @@ static void ipip6_tunnel_bind_dev(struct net_device *dev)
686 .oif = tunnel->parms.link, 686 .oif = tunnel->parms.link,
687 .proto = IPPROTO_IPV6 }; 687 .proto = IPPROTO_IPV6 };
688 struct rtable *rt; 688 struct rtable *rt;
689 if (!ip_route_output_key(&rt, &fl)) { 689 if (!ip_route_output_key(&init_net, &rt, &fl)) {
690 tdev = rt->u.dst.dev; 690 tdev = rt->u.dst.dev;
691 ip_rt_put(rt); 691 ip_rt_put(rt);
692 } 692 }