---

yaml --- r: 352491 b: refs/heads/master c: efd9450 h: refs/heads/master i: 352489: e18d12b 352487: ac7b382 v: v3
git-mirror · Feb 15, 2013 · debfe52 · debfe52
1 parent 7eac584
commit debfe52
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c14dd2680baaef02aa4d221a2b5d337fbfd71b00
+refs/heads/master: efd9450e7e36717f24dff3bd584faa80a85231d6
diff --git a/trunk/net/core/dev.c b/trunk/net/core/dev.c
@@ -3802,7 +3802,6 @@ static enum gro_result dev_gro_receive(struct napi_struct *napi, struct sk_buff
 	__be16 type = skb->protocol;
 	struct list_head *head = &offload_base;
 	int same_flow;
-	int mac_len;
 	enum gro_result ret;
 
 	if (!(skb->dev->features & NETIF_F_GRO) || netpoll_rx_on(skb))
@@ -3819,8 +3818,7 @@ static enum gro_result dev_gro_receive(struct napi_struct *napi, struct sk_buff
 			continue;
 
 		skb_set_network_header(skb, skb_gro_offset(skb));
-		mac_len = skb->network_header - skb->mac_header;
-		skb->mac_len = mac_len;
+		skb_reset_mac_len(skb);
 		NAPI_GRO_CB(skb)->same_flow = 0;
 		NAPI_GRO_CB(skb)->flush = 0;
 		NAPI_GRO_CB(skb)->free = 0;