diff options
| author |   Jose Abreu <Jose.Abreu@synopsys.com> | 2019-08-17 20:54:42 +0200 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2019-08-17 12:43:59 -0700 |
| commit | c887e02a938d7cae9837322448de0af2dd75ee1d (patch) | |
| tree | af9e770b9c6162228ac71f9e09fbc14efee2ff54 /drivers/net/ethernet/stmicro | |
| parent | net: stmmac: Prepare to add Split Header support (diff) | |
| download | linux-dev-c887e02a938d7cae9837322448de0af2dd75ee1d.tar.xz linux-dev-c887e02a938d7cae9837322448de0af2dd75ee1d.zip | |
net: stmmac: xgmac: Correctly return that RX descriptor is not last one
Return the correct value when RX descriptor is not the last one.
Signed-off-by: Jose Abreu <joabreu@synopsys.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/stmicro')
| -rw-r--r-- | drivers/net/ethernet/stmicro/stmmac/dwxgmac2_descs.c | 7 |
1 files 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 58b69fa97837..2c1ed8c2a9d3 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) |