Patchwork [net-next] net: use skb_reset_mac_len() in dev_gro_receive()

login
register
mail settings
Submitter Eric Dumazet
Date Feb. 15, 2013, 3:31 a.m.
Message ID <1360899108.6884.77.camel@edumazet-glaptop>
Download mbox | patch
Permalink /patch/220618/
State Accepted
Delegated to: David Miller
Headers show

Comments

Eric Dumazet - Feb. 15, 2013, 3:31 a.m.
From: Eric Dumazet <edumazet@google.com>

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

Signed-off-by: Eric Dumazet <edumazet@google.com>
---
 net/core/dev.c |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)



--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
David Miller - Feb. 15, 2013, 8:37 p.m.
From: Eric Dumazet <eric.dumazet@gmail.com>
Date: Thu, 14 Feb 2013 19:31:48 -0800

> From: Eric Dumazet <edumazet@google.com>
> 
> We no longer need to use mac_len, lets cleanup things.
> 
> Signed-off-by: Eric Dumazet <edumazet@google.com>

Applied.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/net/core/dev.c b/net/core/dev.c
index f444736..09df22d 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -3784,7 +3784,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))
@@ -3801,8 +3800,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;