diff options
| author | Jose Abreu <Jose.Abreu@synopsys.com> | 2018-05-18 14:56:01 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-05-18 11:00:15 -0400 |
| commit | 44c67f8559fc5e2f818cbb11fde1ee1bebc59e7c (patch) | |
| tree | bec97b8cb28d6e161a61ed5932bee379453f4cf1 /drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | |
| parent | 6844171d5b0567a18248593176e23ae97d76b346 (diff) | |
| download | linux-stable-44c67f8559fc5e2f818cbb11fde1ee1bebc59e7c.tar.gz linux-stable-44c67f8559fc5e2f818cbb11fde1ee1bebc59e7c.tar.bz2 linux-stable-44c67f8559fc5e2f818cbb11fde1ee1bebc59e7c.zip | |
net: stmmac: Let descriptor code clear the descriptor
Stop using if conditions depending on the GMAC version for clearing the
descriptor and use instead a helper implemented in the descriptor files.
Signed-off-by: Jose Abreu <joabreu@synopsys.com>
Cc: David S. Miller <davem@davemloft.net>
Cc: Joao Pinto <jpinto@synopsys.com>
Cc: Vitor Soares <soares@synopsys.com>
Cc: Giuseppe Cavallaro <peppe.cavallaro@st.com>
Cc: Alexandre Torgue <alexandre.torgue@st.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/stmicro/stmmac/stmmac_main.c')
| -rw-r--r-- | drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c index 3f559d72b41f..0ccee6a779f9 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c @@ -1341,14 +1341,7 @@ static int init_dma_tx_desc_rings(struct net_device *dev) else p = tx_q->dma_tx + i; - if (priv->synopsys_id >= DWMAC_CORE_4_00) { - p->des0 = 0; - p->des1 = 0; - p->des2 = 0; - p->des3 = 0; - } else { - p->des2 = 0; - } + stmmac_clear_desc(priv, p); tx_q->tx_skbuff_dma[i].buf = 0; tx_q->tx_skbuff_dma[i].map_as_page = false; |