net: gro: GRO_MERGED_FREE consumes packets
authorEric Dumazet <edumazet@google.com>
Thu, 19 Apr 2012 07:07:40 +0000 (07:07 +0000)
committerDavid S. Miller <davem@davemloft.net>
Thu, 19 Apr 2012 18:23:56 +0000 (14:23 -0400)
commitdaa86548281ec9364eac2925bdf907f861204a5b
treea62cd3cb7df31f0fe26d8c51a4f917b474a4e648
parent85bb2a60fab28a338870faec222a1f2232b01caa
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>
net/core/dev.c