---

yaml --- r: 290109 b: refs/heads/master c: de8261c h: refs/heads/master i: 290107: 99ab979 v: v3
git-mirror · Feb 13, 2012 · df5a71c · df5a71c
1 parent 894cee7
commit df5a71c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c5665a538da6b887a5096358a12527785506e5ac
+refs/heads/master: de8261c2fa364397ed872fad1244d75364689168
diff --git a/trunk/net/core/skbuff.c b/trunk/net/core/skbuff.c
@@ -2906,7 +2906,7 @@ int skb_gro_receive(struct sk_buff **head, struct sk_buff *skb)
 	nskb->prev = p;
 
 	nskb->data_len += p->len;
-	nskb->truesize += p->len;
+	nskb->truesize += p->truesize;
 	nskb->len += p->len;
 
 	*head = nskb;
@@ -2916,6 +2916,7 @@ int skb_gro_receive(struct sk_buff **head, struct sk_buff *skb)
 	p = nskb;
 
 merge:
+	p->truesize += skb->truesize - len;
 	if (offset > headlen) {
 		unsigned int eat = offset - headlen;