From 1015b3a77096a824057d0fa6578efa73babff49f Mon Sep 17 00:00:00 2001
From: Eric Dumazet <edumazet@google.com>
Date: Tue, 11 Dec 2012 08:38:29 +0000
Subject: [PATCH] --- yaml --- r: 342076 b: refs/heads/master c:
 75be437230b06fca87908a787f70de0ce7fbab8c h: refs/heads/master v: v3

---
 [refs]                  | 2 +-
 trunk/net/core/skbuff.c | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 5c65a40409ce..af564163b00f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2ce297fc24d1f0b70c756d1f593e7a089a2d888d
+refs/heads/master: 75be437230b06fca87908a787f70de0ce7fbab8c
diff --git a/trunk/net/core/skbuff.c b/trunk/net/core/skbuff.c
index ccbabf565732..ac9e44a6ab2b 100644
--- a/trunk/net/core/skbuff.c
+++ b/trunk/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;