Patchwork [net-next] net: gro: avoid double copy in skb_gro_receive()

login
register
mail settings
Submitter Eric Dumazet
Date Dec. 11, 2012, 6:38 p.m.
Message ID <1355251109.27891.114.camel@edumazet-glaptop>
Download mbox | patch
Permalink /patch/205290/
State Accepted
Delegated to: David Miller
Headers show

Comments

Eric Dumazet - Dec. 11, 2012, 6:38 p.m.
From: Eric Dumazet <edumazet@google.com>

__copy_skb_header(nskb, p) already copied p->cb[], no need to copy
it again.

Signed-off-by: Eric Dumazet <edumazet@google.com>
---
 net/core/skbuff.c |    1 -
 1 file changed, 1 deletion(-)



--
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 - Dec. 11, 2012, 6:45 p.m.
From: Eric Dumazet <eric.dumazet@gmail.com>
Date: Tue, 11 Dec 2012 10:38:29 -0800

> From: Eric Dumazet <edumazet@google.com>
> 
> __copy_skb_header(nskb, p) already copied p->cb[], no need to copy
> it again.
> 
> Signed-off-by: Eric Dumazet <edumazet@google.com>

Applied, thanks Eric.
--
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/skbuff.c b/net/core/skbuff.c
index ccbabf5..ac9e44a 100644
--- a/net/core/skbuff.c
+++ b/net/core/skbuff.c
@@ -3028,7 +3028,6 @@  int skb_gro_receive(struct sk_buff **head, struct sk_buff *skb)
 	memcpy(skb_mac_header(nskb), skb_mac_header(p),
 	       p->data - skb_mac_header(p));
 
-	*NAPI_GRO_CB(nskb) = *NAPI_GRO_CB(p);
 	skb_shinfo(nskb)->frag_list = p;
 	skb_shinfo(nskb)->gso_size = pinfo->gso_size;
 	pinfo->gso_size = 0;