From: Jarek Poplawski Date: Thu, 5 Aug 2010 01:19:11 +0000 (+0000) Subject: net: Fix napi_gro_frags vs netpoll path X-Git-Tag: v2.6.34.6~33 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=700aaacee609d03b9c790206468340661e8a908d;p=karo-tx-linux.git 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 Acked-by: Herbert Xu Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- diff --git a/net/core/dev.c b/net/core/dev.c index e463f77d42d2..3427c5995496 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -2666,7 +2666,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)) @@ -2753,9 +2753,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) &&