summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorJarek Poplawski <jarkao2@gmail.com>2010-08-05 01:19:11 +0000
committerDavid S. Miller <davem@davemloft.net>2010-08-05 13:21:25 -0700
commitce9e76c8450fc248d3e1fc16ef05e6eb50c02fa5 (patch)
treebd46dd603d5e5fdc0288bc032808be6c7308112d /net
parent23d23e409a51a3eaad17a8045d30fd9cf8fb8a03 (diff)
downloadlinux-ce9e76c8450fc248d3e1fc16ef05e6eb50c02fa5.tar.gz
linux-ce9e76c8450fc248d3e1fc16ef05e6eb50c02fa5.tar.bz2
linux-ce9e76c8450fc248d3e1fc16ef05e6eb50c02fa5.zip
net: Fix napi_gro_frags vs netpoll path
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>
Diffstat (limited to 'net')
-rw-r--r--net/core/dev.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/net/core/dev.c b/net/core/dev.c
index e1c1cdcc2bb0..2b508966146b 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -3072,7 +3072,7 @@ enum gro_result dev_gro_receive(struct napi_struct *napi, struct sk_buff *skb)
int mac_len;
enum gro_result ret;
- if (!(skb->dev->features & NETIF_F_GRO))
+ if (!(skb->dev->features & NETIF_F_GRO) || netpoll_rx_on(skb))
goto normal;
if (skb_is_gso(skb) || skb_has_frags(skb))
@@ -3159,9 +3159,6 @@ __napi_gro_receive(struct napi_struct *napi, struct sk_buff *skb)
{
struct sk_buff *p;
- if (netpoll_rx_on(skb))
- return GRO_NORMAL;
-
for (p = napi->gro_list; p; p = p->next) {
NAPI_GRO_CB(p)->same_flow =
(p->dev == skb->dev) &&