From: Eric Dumazet <edumazet@google.com>
Date: Thu, 19 Apr 2012 07:07:40 +0000 (+0000)
Subject: net: gro: GRO_MERGED_FREE consumes packets
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=daa86548281ec9364eac2925bdf907f861204a5b;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git

net: gro: GRO_MERGED_FREE consumes packets

As part of GRO processing, merged skbs should be consumed, not freed, to
not confuse dropwatch/drop_monitor.

Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/net/core/dev.c b/net/core/dev.c
index c93812733f1d..501f3cc703dd 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -3542,10 +3542,13 @@ gro_result_t napi_skb_finish(gro_result_t ret, struct sk_buff *skb)
 		break;
 
 	case GRO_DROP:
-	case GRO_MERGED_FREE:
 		kfree_skb(skb);
 		break;
 
+	case GRO_MERGED_FREE:
+		consume_skb(skb);
+		break;
+
 	case GRO_HELD:
 	case GRO_MERGED:
 		break;