]> git.hungrycats.org Git - linux/commit
gro: Flush GRO packets in napi_disable_pending path
authorHerbert Xu <herbert@gondor.apana.org.au>
Sat, 27 Jun 2009 02:27:04 +0000 (19:27 -0700)
committerGreg Kroah-Hartman <gregkh@suse.de>
Sun, 16 Aug 2009 21:18:14 +0000 (14:18 -0700)
commit9ba3f8ea722e86b87627c2a4efbd464674e88412
tree414af645193a3913e3df2fd2fe68b508262c6f33
parent12774fb9ee081777593aa3028012929bd8ff3f8b
gro: Flush GRO packets in napi_disable_pending path

[ Upstream commit ff780cd8f2fa928b193554f593b36d1243554212 ]

When NAPI is disabled while we're in net_rx_action, we end up
calling __napi_complete without flushing GRO packets.  This is
a bug as it would cause the GRO packets to linger, of course it
also literally BUGs to catch error like this :)

This patch changes it to napi_complete, with the obligatory IRQ
reenabling.  This should be safe because we've only just disabled
IRQs and it does not materially affect the test conditions in
between.

Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
net/core/dev.c