From: Felix Fietkau <nbd@openwrt.org>
Date: Sun, 4 Jul 2010 02:20:05 +0000 (+0000)
Subject: ar71xx: merge ethernet driver fixes from r22054, r22055
X-Git-Tag: backfire_10.03.1~682
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=d32a6057ce6da9d719c5fe51eba68d5e538e8490;p=openwrt%2Fsvn-archive%2Fopenwrt.git

ar71xx: merge ethernet driver fixes from r22054, r22055

SVN-Revision: 22056
---

diff --git a/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_main.c b/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_main.c
index 8d61294beb..54a6005b59 100644
--- a/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_main.c
+++ b/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_main.c
@@ -435,6 +435,12 @@ static void ag71xx_dma_reset(struct ag71xx *ag)
 	ag71xx_wr(ag, AG71XX_REG_RX_CTRL, 0);
 	ag71xx_wr(ag, AG71XX_REG_TX_CTRL, 0);
 
+	/*
+	 * give the hardware some time to really stop all rx/tx activity
+	 * clearing the descriptors too early causes random memory corruption
+	 */
+	mdelay(1);
+
 	/* clear descriptor addresses */
 	ag71xx_wr(ag, AG71XX_REG_TX_DESC, 0);
 	ag71xx_wr(ag, AG71XX_REG_RX_DESC, 0);
@@ -554,6 +560,8 @@ static int ag71xx_open(struct net_device *dev)
 	if (ret)
 		goto err;
 
+	ag71xx_hw_init(ag);
+
 	napi_enable(&ag->napi);
 
 	netif_carrier_off(dev);