Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6

[firefly-linux-kernel-4.4.55.git] / net / core / skbuff.c

diff --git a/net/core/skbuff.c b/net/core/skbuff.c
index 66d9c416851e7e64dca9b68fe651cca31511575b..f8abf68e3988f7cd5b4a83eb6a18b3ae25d52afd 100644 (file)
--- a/net/core/skbuff.c
+++ b/net/core/skbuff.c
@@ -2722,6 +2722,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;