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-Tag: v3.5-rc1~109^2~390
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=daa86548281ec9364eac2925bdf907f861204a5b;p=pandora-kernel.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>
---

Reading git-diff-tree failed