diff --git a/[refs] b/[refs] index d568aee13b97..35b436b283de 100644 --- 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 index da0c97f2fab4..f3a530780753 100644 --- 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;