From: Eric Dumazet <edumazet@google.com>
Date: Thu, 14 Feb 2013 17:31:48 +0000 (+0000)
Subject: net: use skb_reset_mac_len() in dev_gro_receive()
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=efd9450e7e36717f24dff3bd584faa80a85231d6;p=linux-beck.git

net: use skb_reset_mac_len() in dev_gro_receive()

We no longer need to use mac_len, lets cleanup things.

Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/net/core/dev.c b/net/core/dev.c
index 1cd6297fd34b..6ad37896a324 100644
--- a/net/core/dev.c
+++ b/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;