aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorByungho An <bh74.an@samsung.com>2013-06-28 03:35:32 -0400
committerDavid S. Miller <davem@davemloft.net>2013-07-01 16:33:03 -0400
commit61369d0259a724606f3941a46d2c75155d66cf2c (patch)
tree3797cf786d970cf78022cc2b2f4484c3a6578c58 /drivers/net
parent0d909dcdeffeee3c42703dc1d17766d94fd47b71 (diff)
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>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/ethernet/stmicro/stmmac/stmmac_main.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
index 4fb74a07c01c..520693385d8d 100644
--- 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)
2566 /* Get and dump the chip ID */ 2566 /* Get and dump the chip ID */
2567 priv->synopsys_id = stmmac_get_synopsys_id(priv); 2567 priv->synopsys_id = stmmac_get_synopsys_id(priv);
2568 2568
2569 /* To use alternate (extended) or normal descriptor structures */
2570 stmmac_selec_desc_mode(priv);
2571
2572 /* To use the chained or ring mode */ 2569 /* To use the chained or ring mode */
2573 if (chain_mode) { 2570 if (chain_mode) {
2574 priv->hw->chain = &chain_mode_ops; 2571 priv->hw->chain = &chain_mode_ops;
@@ -2603,6 +2600,9 @@ static int stmmac_hw_init(struct stmmac_priv *priv)
2603 } else 2600 } else
2604 pr_info(" No HW DMA feature register supported"); 2601 pr_info(" No HW DMA feature register supported");
2605 2602
2603 /* To use alternate (extended) or normal descriptor structures */
2604 stmmac_selec_desc_mode(priv);
2605
2606 ret = priv->hw->mac->rx_ipc(priv->ioaddr); 2606 ret = priv->hw->mac->rx_ipc(priv->ioaddr);
2607 if (!ret) { 2607 if (!ret) {
2608 pr_warn(" RX IPC Checksum Offload not configured.\n"); 2608 pr_warn(" RX IPC Checksum Offload not configured.\n");