diff options
Diffstat (limited to 'net/ipv4/ipip.c')
| -rw-r--r-- | net/ipv4/ipip.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/net/ipv4/ipip.c b/net/ipv4/ipip.c index 7fd636711037..ec036731a70b 100644 --- a/net/ipv4/ipip.c +++ b/net/ipv4/ipip.c | |||
| @@ -435,7 +435,7 @@ static netdev_tx_t ipip_tunnel_xmit(struct sk_buff *skb, struct net_device *dev) | |||
| 435 | goto tx_error_icmp; | 435 | goto tx_error_icmp; |
| 436 | } | 436 | } |
| 437 | } | 437 | } |
| 438 | tdev = rt->u.dst.dev; | 438 | tdev = rt->dst.dev; |
| 439 | 439 | ||
| 440 | if (tdev == dev) { | 440 | if (tdev == dev) { |
| 441 | ip_rt_put(rt); | 441 | ip_rt_put(rt); |
| @@ -446,7 +446,7 @@ static netdev_tx_t ipip_tunnel_xmit(struct sk_buff *skb, struct net_device *dev) | |||
| 446 | df |= old_iph->frag_off & htons(IP_DF); | 446 | df |= old_iph->frag_off & htons(IP_DF); |
| 447 | 447 | ||
| 448 | if (df) { | 448 | if (df) { |
| 449 | mtu = dst_mtu(&rt->u.dst) - sizeof(struct iphdr); | 449 | mtu = dst_mtu(&rt->dst) - sizeof(struct iphdr); |
| 450 | 450 | ||
| 451 | if (mtu < 68) { | 451 | if (mtu < 68) { |
| 452 | stats->collisions++; | 452 | stats->collisions++; |
| @@ -503,7 +503,7 @@ static netdev_tx_t ipip_tunnel_xmit(struct sk_buff *skb, struct net_device *dev) | |||
| 503 | IPCB(skb)->flags &= ~(IPSKB_XFRM_TUNNEL_SIZE | IPSKB_XFRM_TRANSFORMED | | 503 | IPCB(skb)->flags &= ~(IPSKB_XFRM_TUNNEL_SIZE | IPSKB_XFRM_TRANSFORMED | |
| 504 | IPSKB_REROUTED); | 504 | IPSKB_REROUTED); |
| 505 | skb_dst_drop(skb); | 505 | skb_dst_drop(skb); |
| 506 | skb_dst_set(skb, &rt->u.dst); | 506 | skb_dst_set(skb, &rt->dst); |
| 507 | 507 | ||
| 508 | /* | 508 | /* |
| 509 | * Push down and install the IPIP header. | 509 | * Push down and install the IPIP header. |
| @@ -552,7 +552,7 @@ static void ipip_tunnel_bind_dev(struct net_device *dev) | |||
| 552 | .proto = IPPROTO_IPIP }; | 552 | .proto = IPPROTO_IPIP }; |
| 553 | struct rtable *rt; | 553 | struct rtable *rt; |
| 554 | if (!ip_route_output_key(dev_net(dev), &rt, &fl)) { | 554 | if (!ip_route_output_key(dev_net(dev), &rt, &fl)) { |
| 555 | tdev = rt->u.dst.dev; | 555 | tdev = rt->dst.dev; |
| 556 | ip_rt_put(rt); | 556 | ip_rt_put(rt); |
| 557 | } | 557 | } |
| 558 | dev->flags |= IFF_POINTOPOINT; | 558 | dev->flags |= IFF_POINTOPOINT; |
