Commit daa86548 authored Apr 19, 2012 by Eric Dumazet Committed by David S. Miller Apr 19, 2012

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>

parent 85bb2a60

net/core/dev.c

+4 −1

Original line number	Diff line number	Diff line
		@@ -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;