net: gro: avoid double copy in skb_gro_receive()
authorEric Dumazet <edumazet@google.com>
Tue, 11 Dec 2012 08:38:29 +0000 (08:38 +0000)
committerDavid S. Miller <davem@davemloft.net>
Tue, 11 Dec 2012 18:44:09 +0000 (13:44 -0500)
__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>
net/core/skbuff.c

index ccbabf5657323cc94cd6f89f9af1532c77b0934b..ac9e44a6ab2bf31cafac577d151babed96779580 100644 (file)
@@ -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;