---

yaml --- r: 232450 b: refs/heads/master c: d1dc7ab h: refs/heads/master v: v3
git-mirror · Jan 24, 2011 · 2e0072d · 2e0072d
1 parent 982477d
commit 2e0072d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e92427b289d252cfbd4cb5282d92f4ce1a5bb1fb
+refs/heads/master: d1dc7abf2fafa34b0ffcd070fd59405aa9c0a4d8
diff --git a/trunk/net/core/skbuff.c b/trunk/net/core/skbuff.c
@@ -2744,8 +2744,12 @@ int skb_gro_receive(struct sk_buff **head, struct sk_buff *skb)
 
 merge:
 	if (offset > headlen) {
-		skbinfo->frags[0].page_offset += offset - headlen;
-		skbinfo->frags[0].size -= offset - headlen;
+		unsigned int eat = offset - headlen;
+
+		skbinfo->frags[0].page_offset += eat;
+		skbinfo->frags[0].size -= eat;
+		skb->data_len -= eat;
+		skb->len -= eat;
 		offset = headlen;
 	}