From: Eric Dumazet <eric.dumazet@gmail.com>
Date: Mon, 13 Feb 2012 04:09:20 +0000 (+0000)
Subject: gro: fix truesize underestimation
X-Git-Tag: v2.6.39-400.9.0~221
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=2590d413b5864765eb9b6dd3399dfb7888ef4ee8;p=users%2Fjedix%2Flinux-maple.git

gro: fix truesize underestimation

skb_gro_receive() doesnt update truesize properly when adding one skb to
frag_list.

Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Cc: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/net/core/skbuff.c b/net/core/skbuff.c
index d44cc7194fd7c..07d6afa64c885 100644
--- a/net/core/skbuff.c
+++ b/net/core/skbuff.c
@@ -2790,7 +2790,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;
@@ -2800,6 +2800,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;