diff options
| author | Jarek Poplawski <jarkao2@gmail.com> | 2010-08-05 01:19:11 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-08-26 16:46:00 -0700 |
| commit | 525127bf8070a869857a66c1c5c6c5324bb335dc (patch) | |
| tree | 4f309b2deb747916b267abf9776b85ec2465ecb2 /net | |
| parent | b46ddc15f90dca13564f9c2be6210d7d9fef014b (diff) | |
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>
Diffstat (limited to 'net')
| -rw-r--r-- | net/core/dev.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/net/core/dev.c b/net/core/dev.c index 1f466e82ac3..bcfb093732a 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -3064,7 +3064,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)) @@ -3151,9 +3151,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) && |