@@ -183,6 +183,8 @@ static void ag71xx_ring_tx_init(struct ag71xx *ag)
ring->curr = 0;
ring->dirty = 0;
netdev_reset_queue(ag->dev);
+
+ ag71xx_wr(ag, AG71XX_REG_TX_DESC, ag->tx_ring.descs_dma);
}
static void ag71xx_ring_rx_clean(struct ag71xx *ag)
@@ -272,6 +274,8 @@ static int ag71xx_ring_rx_init(struct ag71xx *ag)
ring->curr = 0;
ring->dirty = 0;
+ ag71xx_wr(ag, AG71XX_REG_RX_DESC, ag->rx_ring.descs_dma);
+
return ret;
}
@@ -652,9 +656,6 @@ static int ag71xx_open(struct net_device *dev)
netif_carrier_off(dev);
ag71xx_phy_start(ag);
- ag71xx_wr(ag, AG71XX_REG_TX_DESC, ag->tx_ring.descs_dma);
- ag71xx_wr(ag, AG71XX_REG_RX_DESC, ag->rx_ring.descs_dma);
-
ag71xx_hw_set_macaddr(ag, dev->dev_addr);
netif_start_queue(dev);
@@ -873,6 +874,8 @@ static void ag71xx_restart_work_func(struct work_struct *work)
if (ag71xx_get_pdata(ag)->is_ar724x) {
ag->link = 0;
ag71xx_link_adjust(ag);
+ ag71xx_rings_cleanup(ag);
+ ag71xx_rings_init(ag);
return;
}
@@ -919,7 +922,7 @@ static int ag71xx_tx_packets(struct ag71xx *ag, bool flush)
struct sk_buff *skb = ring->buf[i].skb;
if (!flush && !ag71xx_desc_empty(desc)) {
- if (pdata->is_ar7240 &&
+ if (pdata->is_ar724x &&
ag71xx_check_dma_stuck(ag, ring->buf[i].timestamp))
schedule_work(&ag->restart_work);
break;