aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv4/ipip.c
diff options
context:
space:
mode:
Diffstat (limited to 'net/ipv4/ipip.c')
-rw-r--r--net/ipv4/ipip.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/net/ipv4/ipip.c b/net/ipv4/ipip.c
index 160535b51705..da281581692c 100644
--- a/net/ipv4/ipip.c
+++ b/net/ipv4/ipip.c
@@ -405,7 +405,7 @@ out:
405 fl.fl4_daddr = eiph->saddr; 405 fl.fl4_daddr = eiph->saddr;
406 fl.fl4_tos = RT_TOS(eiph->tos); 406 fl.fl4_tos = RT_TOS(eiph->tos);
407 fl.proto = IPPROTO_IPIP; 407 fl.proto = IPPROTO_IPIP;
408 if (ip_route_output_key(&rt, &key)) { 408 if (ip_route_output_key(&init_net, &rt, &key)) {
409 kfree_skb(skb2); 409 kfree_skb(skb2);
410 return 0; 410 return 0;
411 } 411 }
@@ -418,7 +418,7 @@ out:
418 fl.fl4_daddr = eiph->daddr; 418 fl.fl4_daddr = eiph->daddr;
419 fl.fl4_src = eiph->saddr; 419 fl.fl4_src = eiph->saddr;
420 fl.fl4_tos = eiph->tos; 420 fl.fl4_tos = eiph->tos;
421 if (ip_route_output_key(&rt, &fl) || 421 if (ip_route_output_key(&init_net, &rt, &fl) ||
422 rt->u.dst.dev->type != ARPHRD_TUNNEL) { 422 rt->u.dst.dev->type != ARPHRD_TUNNEL) {
423 ip_rt_put(rt); 423 ip_rt_put(rt);
424 kfree_skb(skb2); 424 kfree_skb(skb2);
@@ -547,7 +547,7 @@ static int ipip_tunnel_xmit(struct sk_buff *skb, struct net_device *dev)
547 .saddr = tiph->saddr, 547 .saddr = tiph->saddr,
548 .tos = RT_TOS(tos) } }, 548 .tos = RT_TOS(tos) } },
549 .proto = IPPROTO_IPIP }; 549 .proto = IPPROTO_IPIP };
550 if (ip_route_output_key(&rt, &fl)) { 550 if (ip_route_output_key(&init_net, &rt, &fl)) {
551 tunnel->stat.tx_carrier_errors++; 551 tunnel->stat.tx_carrier_errors++;
552 goto tx_error_icmp; 552 goto tx_error_icmp;
553 } 553 }
@@ -668,7 +668,7 @@ static void ipip_tunnel_bind_dev(struct net_device *dev)
668 .tos = RT_TOS(iph->tos) } }, 668 .tos = RT_TOS(iph->tos) } },
669 .proto = IPPROTO_IPIP }; 669 .proto = IPPROTO_IPIP };
670 struct rtable *rt; 670 struct rtable *rt;
671 if (!ip_route_output_key(&rt, &fl)) { 671 if (!ip_route_output_key(&init_net, &rt, &fl)) {
672 tdev = rt->u.dst.dev; 672 tdev = rt->u.dst.dev;
673 ip_rt_put(rt); 673 ip_rt_put(rt);
674 } 674 }