net: stmmac: fixed enh_desc set always zero

This patch fixed that enh_desc value is always zero.
Due to calling order of stmmac_selec_desc_mode(), enh_desc value is always zero.
Even though mac is set to use enhanced dma descriptor, if enh_desc is zero,
functions related dma descriptor are not working correctly.

Signed-off-by: Byungho An <bh74.an@samsung.com>
Acked-by: Giuseppe Cavallaro <peppe.cavallaro@st.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
index 4fb74a07c01cc5206b1f660a0d78536cb6ca688e..520693385d8d7f1e97ace0dbad255bbb5655ace6 100644 (file)
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
@@ -2566,9 +2566,6 @@ static int stmmac_hw_init(struct stmmac_priv *priv)
        /* Get and dump the chip ID */
        priv->synopsys_id = stmmac_get_synopsys_id(priv);
 
-       /* To use alternate (extended) or normal descriptor structures */
-       stmmac_selec_desc_mode(priv);
-
        /* To use the chained or ring mode */
        if (chain_mode) {
                priv->hw->chain = &chain_mode_ops;
@@ -2603,6 +2600,9 @@ static int stmmac_hw_init(struct stmmac_priv *priv)
        } else
                pr_info(" No HW DMA feature register supported");
 
+       /* To use alternate (extended) or normal descriptor structures */
+       stmmac_selec_desc_mode(priv);
+
        ret = priv->hw->mac->rx_ipc(priv->ioaddr);
        if (!ret) {
                pr_warn(" RX IPC Checksum Offload not configured.\n");