Skip to content

Commit

Permalink
[IPIP]: Use proper net in (mostly) routing calls.
Browse files Browse the repository at this point in the history
There are some ip_route_output_key() calls in there that require
a proper net so give one to them.

Besides - give a proper net to a single __get_dev_by_index call 
in ipip_tunnel_bind_dev().

Signed-off-by: Pavel Emelyanov <xemul@openvz.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Pavel Emelyanov authored and David S. Miller committed Apr 16, 2008
1 parent 44d3c29 commit b99f015
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions net/ipv4/ipip.c
Original file line number Diff line number Diff line change
Expand Up @@ -415,7 +415,7 @@ static int ipip_err(struct sk_buff *skb, u32 info)
fl.fl4_daddr = eiph->saddr;
fl.fl4_tos = RT_TOS(eiph->tos);
fl.proto = IPPROTO_IPIP;
if (ip_route_output_key(&init_net, &rt, &key)) {
if (ip_route_output_key(dev_net(skb->dev), &rt, &key)) {
kfree_skb(skb2);
return 0;
}
Expand All @@ -428,7 +428,7 @@ static int ipip_err(struct sk_buff *skb, u32 info)
fl.fl4_daddr = eiph->daddr;
fl.fl4_src = eiph->saddr;
fl.fl4_tos = eiph->tos;
if (ip_route_output_key(&init_net, &rt, &fl) ||
if (ip_route_output_key(dev_net(skb->dev), &rt, &fl) ||
rt->u.dst.dev->type != ARPHRD_TUNNEL) {
ip_rt_put(rt);
kfree_skb(skb2);
Expand Down Expand Up @@ -558,7 +558,7 @@ static int ipip_tunnel_xmit(struct sk_buff *skb, struct net_device *dev)
.saddr = tiph->saddr,
.tos = RT_TOS(tos) } },
.proto = IPPROTO_IPIP };
if (ip_route_output_key(&init_net, &rt, &fl)) {
if (ip_route_output_key(dev_net(dev), &rt, &fl)) {
tunnel->stat.tx_carrier_errors++;
goto tx_error_icmp;
}
Expand Down Expand Up @@ -679,15 +679,15 @@ static void ipip_tunnel_bind_dev(struct net_device *dev)
.tos = RT_TOS(iph->tos) } },
.proto = IPPROTO_IPIP };
struct rtable *rt;
if (!ip_route_output_key(&init_net, &rt, &fl)) {
if (!ip_route_output_key(dev_net(dev), &rt, &fl)) {
tdev = rt->u.dst.dev;
ip_rt_put(rt);
}
dev->flags |= IFF_POINTOPOINT;
}

if (!tdev && tunnel->parms.link)
tdev = __dev_get_by_index(&init_net, tunnel->parms.link);
tdev = __dev_get_by_index(dev_net(dev), tunnel->parms.link);

if (tdev) {
dev->hard_header_len = tdev->hard_header_len + sizeof(struct iphdr);
Expand Down

0 comments on commit b99f015

Please sign in to comment.