net: Fix napi_gro_frags vs netpoll path
commit700aaacee609d03b9c790206468340661e8a908d
authorJarek Poplawski <jarkao2@gmail.com>
Thu, 5 Aug 2010 01:19:11 +0000 (5 01:19 +0000)
committerGreg Kroah-Hartman <gregkh@suse.de>
Thu, 26 Aug 2010 23:43:46 +0000 (26 16:43 -0700)
tree42e5a36178595cfa5b97820410edd50bda70d478
parent9ee75e1b9432504b88b6235ade3bfa8bf210fb33
net: Fix napi_gro_frags vs netpoll path

[ Upstream commit ce9e76c8450fc248d3e1fc16ef05e6eb50c02fa5 ]

The netpoll_rx_on() check in __napi_gro_receive() skips part of the
"common" GRO_NORMAL path, especially "pull:" in dev_gro_receive(),
where at least eth header should be copied for entirely paged skbs.

Signed-off-by: Jarek Poplawski <jarkao2@gmail.com>
Acked-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