diff options
| author | Jason A. Donenfeld <Jason@zx2c4.com> | 2020-06-24 16:06:04 -0600 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-06-25 16:16:21 -0700 |
| commit | e5e7d8052f6140985c03bd49ebaa0af9c2944bc6 (patch) | |
| tree | 198b950d9e169570634fc782bcde0fd4ff4a615c /drivers/net/ethernet | |
| parent | df08126e3833e9dca19e2407db5f5860a7c194fb (diff) | |
| download | linux-stable-e5e7d8052f6140985c03bd49ebaa0af9c2944bc6.tar.gz linux-stable-e5e7d8052f6140985c03bd49ebaa0af9c2944bc6.tar.bz2 linux-stable-e5e7d8052f6140985c03bd49ebaa0af9c2944bc6.zip | |
socionext: account for napi_gro_receive never returning GRO_DROP
The napi_gro_receive function no longer returns GRO_DROP ever, making
handling GRO_DROP dead code. This commit removes that dead code.
Further, it's not even clear that device drivers have any business in
taking action after passing off received packets; that's arguably out of
their hands.
Fixes: 6570bc79c0df ("net: core: use listified Rx for GRO_NORMAL in napi_gro_receive()")
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet')
| -rw-r--r-- | drivers/net/ethernet/socionext/netsec.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/ethernet/socionext/netsec.c b/drivers/net/ethernet/socionext/netsec.c index 328bc38848bb..0f366cc50b74 100644 --- a/drivers/net/ethernet/socionext/netsec.c +++ b/drivers/net/ethernet/socionext/netsec.c @@ -1044,8 +1044,9 @@ static int netsec_process_rx(struct netsec_priv *priv, int budget) skb->ip_summed = CHECKSUM_UNNECESSARY; next: - if ((skb && napi_gro_receive(&priv->napi, skb) != GRO_DROP) || - xdp_result) { + if (skb) + napi_gro_receive(&priv->napi, skb); + if (skb || xdp_result) { ndev->stats.rx_packets++; ndev->stats.rx_bytes += xdp.data_end - xdp.data; } |