summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorEric Dumazet <edumazet@google.com>2012-12-11 08:38:29 +0000
committerDavid S. Miller <davem@davemloft.net>2012-12-11 13:44:09 -0500
commit75be437230b06fca87908a787f70de0ce7fbab8c (patch)
tree3afd109d96e6a30e08807050459fc98f343c916b /net
parent2ce297fc24d1f0b70c756d1f593e7a089a2d888d (diff)
downloadlinux-75be437230b06fca87908a787f70de0ce7fbab8c.tar.bz2
net: gro: avoid double copy in skb_gro_receive()
__copy_skb_header(nskb, p) already copied p->cb[], no need to copy it again. Signed-off-by: Eric Dumazet <edumazet@google.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r--net/core/skbuff.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/net/core/skbuff.c b/net/core/skbuff.c
index ccbabf565732..ac9e44a6ab2b 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;