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 c93812733f1da842058d6f40fcf9715c39cdb463..501f3cc703dde39cc84a6df4dba3ae63a2c020f0 100644 (file)
--- 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;