diff options
Diffstat (limited to 'net/ipv4/ipip.c')
-rw-r--r-- | net/ipv4/ipip.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv4/ipip.c b/net/ipv4/ipip.c index b32b50114806..37ab39170175 100644 --- a/net/ipv4/ipip.c +++ b/net/ipv4/ipip.c | |||
@@ -485,7 +485,7 @@ static int ipip_rcv(struct sk_buff *skb) | |||
485 | 485 | ||
486 | secpath_reset(skb); | 486 | secpath_reset(skb); |
487 | 487 | ||
488 | skb->mac.raw = skb->nh.raw; | 488 | skb->mac_header = skb->network_header; |
489 | skb_reset_network_header(skb); | 489 | skb_reset_network_header(skb); |
490 | skb->protocol = htons(ETH_P_IP); | 490 | skb->protocol = htons(ETH_P_IP); |
491 | skb->pkt_type = PACKET_HOST; | 491 | skb->pkt_type = PACKET_HOST; |
@@ -617,7 +617,7 @@ static int ipip_tunnel_xmit(struct sk_buff *skb, struct net_device *dev) | |||
617 | old_iph = ip_hdr(skb); | 617 | old_iph = ip_hdr(skb); |
618 | } | 618 | } |
619 | 619 | ||
620 | skb->h.raw = skb->nh.raw; | 620 | skb->transport_header = skb->network_header; |
621 | skb_push(skb, sizeof(struct iphdr)); | 621 | skb_push(skb, sizeof(struct iphdr)); |
622 | skb_reset_network_header(skb); | 622 | skb_reset_network_header(skb); |
623 | memset(&(IPCB(skb)->opt), 0, sizeof(IPCB(skb)->opt)); | 623 | memset(&(IPCB(skb)->opt), 0, sizeof(IPCB(skb)->opt)); |