aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv6/sit.c
diff options
context:
space:
mode:
Diffstat (limited to 'net/ipv6/sit.c')
-rw-r--r--net/ipv6/sit.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv6/sit.c b/net/ipv6/sit.c
index 1e8827b90aa7..27fe10ffacb0 100644
--- a/net/ipv6/sit.c
+++ b/net/ipv6/sit.c
@@ -382,7 +382,7 @@ static int ipip6_rcv(struct sk_buff *skb)
382 read_lock(&ipip6_lock); 382 read_lock(&ipip6_lock);
383 if ((tunnel = ipip6_tunnel_lookup(iph->saddr, iph->daddr)) != NULL) { 383 if ((tunnel = ipip6_tunnel_lookup(iph->saddr, iph->daddr)) != NULL) {
384 secpath_reset(skb); 384 secpath_reset(skb);
385 skb->mac.raw = skb->nh.raw; 385 skb->mac_header = skb->network_header;
386 skb_reset_network_header(skb); 386 skb_reset_network_header(skb);
387 IPCB(skb)->flags = 0; 387 IPCB(skb)->flags = 0;
388 skb->protocol = htons(ETH_P_IPV6); 388 skb->protocol = htons(ETH_P_IPV6);
@@ -553,7 +553,7 @@ static int ipip6_tunnel_xmit(struct sk_buff *skb, struct net_device *dev)
553 iph6 = ipv6_hdr(skb); 553 iph6 = ipv6_hdr(skb);
554 } 554 }
555 555
556 skb->h.raw = skb->nh.raw; 556 skb->transport_header = skb->network_header;
557 skb_push(skb, sizeof(struct iphdr)); 557 skb_push(skb, sizeof(struct iphdr));
558 skb_reset_network_header(skb); 558 skb_reset_network_header(skb);
559 memset(&(IPCB(skb)->opt), 0, sizeof(IPCB(skb)->opt)); 559 memset(&(IPCB(skb)->opt), 0, sizeof(IPCB(skb)->opt));