lkml.org 
[lkml]   [2020]   [Jun]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.7 174/265] socionext: account for napi_gro_receive never returning GRO_DROP
    Date
    From: "Jason A. Donenfeld" <Jason@zx2c4.com>

    [ Upstream commit e5e7d8052f6140985c03bd49ebaa0af9c2944bc6 ]

    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>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/net/ethernet/socionext/netsec.c | 5 +++--
    1 file changed, 3 insertions(+), 2 deletions(-)

    diff --git a/drivers/net/ethernet/socionext/netsec.c b/drivers/net/ethernet/socionext/netsec.c
    index a5a0fb60193ab..5a70c49bf454f 100644
    --- a/drivers/net/ethernet/socionext/netsec.c
    +++ b/drivers/net/ethernet/socionext/netsec.c
    @@ -1038,8 +1038,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;
    }
    --
    2.25.1
    \
     
     \ /
      Last update: 2020-06-30 00:10    [W:4.133 / U:0.636 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site