lkml.org 
[lkml]   [2019]   [Aug]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH net-next v2 03/12] net: stmmac: xgmac: Correctly return that RX descriptor is not last one
    Date
    Return the correct value when RX descriptor is not the last one.

    Signed-off-by: Jose Abreu <joabreu@synopsys.com>

    ---
    Cc: Giuseppe Cavallaro <peppe.cavallaro@st.com>
    Cc: Alexandre Torgue <alexandre.torgue@st.com>
    Cc: Jose Abreu <joabreu@synopsys.com>
    Cc: "David S. Miller" <davem@davemloft.net>
    Cc: Maxime Coquelin <mcoquelin.stm32@gmail.com>
    Cc: netdev@vger.kernel.org
    Cc: linux-stm32@st-md-mailman.stormreply.com
    Cc: linux-arm-kernel@lists.infradead.org
    Cc: linux-kernel@vger.kernel.org
    ---
    drivers/net/ethernet/stmicro/stmmac/dwxgmac2_descs.c | 7 +++----
    1 file changed, 3 insertions(+), 4 deletions(-)

    diff --git a/drivers/net/ethernet/stmicro/stmmac/dwxgmac2_descs.c b/drivers/net/ethernet/stmicro/stmmac/dwxgmac2_descs.c
    index 2391ede97597..717b50d4aa93 100644
    --- a/drivers/net/ethernet/stmicro/stmmac/dwxgmac2_descs.c
    +++ b/drivers/net/ethernet/stmicro/stmmac/dwxgmac2_descs.c
    @@ -26,16 +26,15 @@ static int dwxgmac2_get_rx_status(void *data, struct stmmac_extra_stats *x,
    struct dma_desc *p)
    {
    unsigned int rdes3 = le32_to_cpu(p->des3);
    - int ret = good_frame;

    if (unlikely(rdes3 & XGMAC_RDES3_OWN))
    return dma_own;
    if (likely(!(rdes3 & XGMAC_RDES3_LD)))
    + return rx_not_ls;
    + if (unlikely((rdes3 & XGMAC_RDES3_ES) && (rdes3 & XGMAC_RDES3_LD)))
    return discard_frame;
    - if (unlikely(rdes3 & XGMAC_RDES3_ES))
    - ret = discard_frame;

    - return ret;
    + return good_frame;
    }

    static int dwxgmac2_get_tx_len(struct dma_desc *p)
    --
    2.7.4
    \
     
     \ /
      Last update: 2019-08-12 11:46    [W:3.729 / U:0.068 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site