aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv6/ip6_tunnel.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/ip6_tunnel.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/ip6_tunnel.c')
-rw-r--r--net/ipv6/ip6_tunnel.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv6/ip6_tunnel.c b/net/ipv6/ip6_tunnel.c
index 425c9ae8b315..9031e521c1df 100644
--- a/net/ipv6/ip6_tunnel.c
+++ b/net/ipv6/ip6_tunnel.c
@@ -533,7 +533,7 @@ ip4ip6_err(struct sk_buff *skb, struct inet6_skb_parm *opt,
533 fl.fl4_dst = eiph->saddr; 533 fl.fl4_dst = eiph->saddr;
534 fl.fl4_tos = RT_TOS(eiph->tos); 534 fl.fl4_tos = RT_TOS(eiph->tos);
535 fl.proto = IPPROTO_IPIP; 535 fl.proto = IPPROTO_IPIP;
536 if (ip_route_output_key(&rt, &fl)) 536 if (ip_route_output_key(&init_net, &rt, &fl))
537 goto out; 537 goto out;
538 538
539 skb2->dev = rt->u.dst.dev; 539 skb2->dev = rt->u.dst.dev;
@@ -545,7 +545,7 @@ ip4ip6_err(struct sk_buff *skb, struct inet6_skb_parm *opt,
545 fl.fl4_dst = eiph->daddr; 545 fl.fl4_dst = eiph->daddr;
546 fl.fl4_src = eiph->saddr; 546 fl.fl4_src = eiph->saddr;
547 fl.fl4_tos = eiph->tos; 547 fl.fl4_tos = eiph->tos;
548 if (ip_route_output_key(&rt, &fl) || 548 if (ip_route_output_key(&init_net, &rt, &fl) ||
549 rt->u.dst.dev->type != ARPHRD_TUNNEL) { 549 rt->u.dst.dev->type != ARPHRD_TUNNEL) {
550 ip_rt_put(rt); 550 ip_rt_put(rt);
551 goto out; 551 goto out;