net: make GRO aware of skb->head_frag

[pandora-kernel.git] / net / core / dev.c

diff --git a/net/core/dev.c b/net/core/dev.c
index 501f3cc..a2be59f 100644 (file)
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -3546,7 +3546,10 @@ gro_result_t napi_skb_finish(gro_result_t ret, struct sk_buff *skb)
                break;
 
        case GRO_MERGED_FREE:
-               consume_skb(skb);
+               if (NAPI_GRO_CB(skb)->free == NAPI_GRO_FREE_STOLEN_HEAD)
+                       kmem_cache_free(skbuff_head_cache, skb);
+               else
+                       __kfree_skb(skb);
                break;
 
        case GRO_HELD: