From c417326d217aba079b85fd526867c4668c47197d Mon Sep 17 00:00:00 2001
From: Herbert Xu <herbert@gondor.apana.org.au>
Date: Thu, 20 May 2010 23:07:56 -0700
Subject: [PATCH] --- yaml --- r: 198563 b: refs/heads/master c:
 622e0ca1cd4d459f5af4f2c65f4dc0dd823cb4c3 h: refs/heads/master i:   198561:
 ce057f36eef9475fcd5c90a22bec6174f746460d   198559:
 5924ea2f15b5c3726b1d8e5aed3fc95e3d7b3d9c v: v3

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

diff --git a/[refs] b/[refs]
index d535436a7807..5c5503606b62 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 119fc60a2d20b63439fdae99f0c7022d3dd99def
+refs/heads/master: 622e0ca1cd4d459f5af4f2c65f4dc0dd823cb4c3
diff --git a/trunk/net/core/skbuff.c b/trunk/net/core/skbuff.c
index c543dd252433..4c11000a96aa 100644
--- a/trunk/net/core/skbuff.c
+++ b/trunk/net/core/skbuff.c
@@ -2718,6 +2718,7 @@ int skb_gro_receive(struct sk_buff **head, struct sk_buff *skb)
 	*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;
 	skb_header_release(p);
 	nskb->prev = p;