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 <Jisheng.Zhang@synaptics.com>
Reviewed-by: Gregory CLEMENT <gregory.clement@bootlin.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/marvell/mvneta.c b/drivers/net/ethernet/marvell/mvneta.c
index bc80a67..814aee9 100644 (file)
--- 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;