diff options
| author | Jisheng Zhang <Jisheng.Zhang@synaptics.com> | 2018-08-31 10:09:13 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-09-02 23:13:31 +0200 |
| commit | d28118e39516c7e9ee620acf3ba19f41703bdb29 (patch) | |
| tree | 8fcfac392df7b577564f3a304448c2be84d1f67b /drivers/net/ethernet/marvell/mvneta.c | |
| parent | net/sched: fix type of htb statistics (diff) | |
| download | linux-d28118e39516c7e9ee620acf3ba19f41703bdb29.tar.xz linux-d28118e39516c7e9ee620acf3ba19f41703bdb29.zip | |
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>
Diffstat (limited to 'drivers/net/ethernet/marvell/mvneta.c')
| -rw-r--r-- | drivers/net/ethernet/marvell/mvneta.c | 5 |
1 files changed, 1 insertions, 4 deletions
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; |