aboutsummaryrefslogtreecommitdiffstats
path: root/net/core/dev.c
diff options
context:
space:
mode:
Diffstat (limited to 'net/core/dev.c')
-rw-r--r--net/core/dev.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/net/core/dev.c b/net/core/dev.c
index 30fcc7f9d4ed..6562e5736e2f 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -1077,7 +1077,7 @@ static void dev_queue_xmit_nit(struct sk_buff *skb, struct net_device *dev)
1077 skb_reset_network_header(skb2); 1077 skb_reset_network_header(skb2);
1078 } 1078 }
1079 1079
1080 skb2->h.raw = skb2->nh.raw; 1080 skb2->transport_header = skb2->network_header;
1081 skb2->pkt_type = PACKET_OUTGOING; 1081 skb2->pkt_type = PACKET_OUTGOING;
1082 ptype->func(skb2, skb->dev, ptype, skb->dev); 1082 ptype->func(skb2, skb->dev, ptype, skb->dev);
1083 } 1083 }
@@ -1207,7 +1207,7 @@ struct sk_buff *skb_gso_segment(struct sk_buff *skb, int features)
1207 BUG_ON(skb_shinfo(skb)->frag_list); 1207 BUG_ON(skb_shinfo(skb)->frag_list);
1208 1208
1209 skb_reset_mac_header(skb); 1209 skb_reset_mac_header(skb);
1210 skb->mac_len = skb->nh.raw - skb->mac.raw; 1210 skb->mac_len = skb->network_header - skb->mac_header;
1211 __skb_pull(skb, skb->mac_len); 1211 __skb_pull(skb, skb->mac_len);
1212 1212
1213 if (unlikely(skb->ip_summed != CHECKSUM_PARTIAL)) { 1213 if (unlikely(skb->ip_summed != CHECKSUM_PARTIAL)) {
@@ -1774,7 +1774,7 @@ int netif_receive_skb(struct sk_buff *skb)
1774 1774
1775 skb_reset_network_header(skb); 1775 skb_reset_network_header(skb);
1776 skb_reset_transport_header(skb); 1776 skb_reset_transport_header(skb);
1777 skb->mac_len = skb->nh.raw - skb->mac.raw; 1777 skb->mac_len = skb->network_header - skb->mac_header;
1778 1778
1779 pt_prev = NULL; 1779 pt_prev = NULL;
1780 1780