From: Jisheng Zhang Date: Fri, 31 Aug 2018 08:09:13 +0000 (+0800) Subject: net: mvneta: Don't check NETIF_F_GRO ourself X-Git-Tag: microblaze-v5.0-rc1~24^2~457^2~2 X-Git-Url: http://git.monstr.eu/?a=commitdiff_plain;h=d28118e39516c7e9ee620acf3ba19f41703bdb29;p=linux-2.6-microblaze.git net: mvneta: Don't check NETIF_F_GRO ourself napi_gro_receive() checks NETIF_F_GRO bit as well, if the bit is not set, we will go through GRO_NORMAL in napi_skb_finish(), so fall back to netif_receive_skb_internal(), so we don't need to check NETIF_F_GRO ourself. Signed-off-by: Jisheng Zhang Reviewed-by: Gregory CLEMENT Signed-off-by: David S. Miller --- diff --git a/drivers/net/ethernet/marvell/mvneta.c b/drivers/net/ethernet/marvell/mvneta.c index bc80a678abc3..814aee92a1d3 100644 --- a/drivers/net/ethernet/marvell/mvneta.c +++ b/drivers/net/ethernet/marvell/mvneta.c @@ -2065,10 +2065,7 @@ static int mvneta_rx_swbm(struct napi_struct *napi, /* Linux processing */ rxq->skb->protocol = eth_type_trans(rxq->skb, dev); - if (dev->features & NETIF_F_GRO) - napi_gro_receive(napi, rxq->skb); - else - netif_receive_skb(rxq->skb); + napi_gro_receive(napi, rxq->skb); /* clean uncomplete skb pointer in queue */ rxq->skb = NULL;