aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv6/ip6_tunnel.c
diff options
context:
space:
mode:
Diffstat (limited to 'net/ipv6/ip6_tunnel.c')
-rw-r--r--net/ipv6/ip6_tunnel.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv6/ip6_tunnel.c b/net/ipv6/ip6_tunnel.c
index 05b59a77bc69..a0902fbdb4e1 100644
--- a/net/ipv6/ip6_tunnel.c
+++ b/net/ipv6/ip6_tunnel.c
@@ -701,7 +701,7 @@ static int ip6_tnl_rcv(struct sk_buff *skb, __u16 protocol,
701 goto discard; 701 goto discard;
702 } 702 }
703 secpath_reset(skb); 703 secpath_reset(skb);
704 skb->mac.raw = skb->nh.raw; 704 skb->mac_header = skb->network_header;
705 skb_reset_network_header(skb); 705 skb_reset_network_header(skb);
706 skb->protocol = htons(protocol); 706 skb->protocol = htons(protocol);
707 skb->pkt_type = PACKET_HOST; 707 skb->pkt_type = PACKET_HOST;
@@ -898,7 +898,7 @@ static int ip6_tnl_xmit2(struct sk_buff *skb,
898 dst_release(skb->dst); 898 dst_release(skb->dst);
899 skb->dst = dst_clone(dst); 899 skb->dst = dst_clone(dst);
900 900
901 skb->h.raw = skb->nh.raw; 901 skb->transport_header = skb->network_header;
902 902
903 proto = fl->proto; 903 proto = fl->proto;
904 if (encap_limit >= 0) { 904 if (encap_limit >= 0) {