diff options
Diffstat (limited to 'net/ipv6')
-rw-r--r-- | net/ipv6/ip6_tunnel.c | 4 | ||||
-rw-r--r-- | net/ipv6/sit.c | 4 |
2 files changed, 4 insertions, 4 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; |
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 | } |