---

yaml --- r: 198563 b: refs/heads/master c: 622e0ca h: refs/heads/master i: 198561: ce057f3 198559: 5924ea2 v: v3
git-mirror · May 21, 2010 · c417326 · c417326
1 parent ffede0a
commit c417326
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git 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
@@ -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;