aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2011-04-02 00:47:25 +0000
committerFelix Fietkau <nbd@openwrt.org>2011-04-02 00:47:25 +0000
commitacbb3e50e7ab64b094c4031b899d8dd104d1c2eb (patch)
treeff2abf88d49a688c37ad5e8507357679f5f7278b
parente42e2b3e9cf470dd2c8da497a8a87500f5451a53 (diff)
downloadupstream-acbb3e50e7ab64b094c4031b899d8dd104d1c2eb.tar.gz
upstream-acbb3e50e7ab64b094c4031b899d8dd104d1c2eb.tar.bz2
upstream-acbb3e50e7ab64b094c4031b899d8dd104d1c2eb.zip
ar71xx: frequent ethernet mac resets upset the MDIO bus on ar7240, so do not run them on every device open, only on tx timeouts
SVN-Revision: 26392
-rw-r--r--target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_main.c9
1 files changed, 5 insertions, 4 deletions
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 883489f26c..eae443e8ce 100644
--- a/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_main.c
+++ b/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_main.c
@@ -574,16 +574,12 @@ static void ag71xx_hw_stop(struct ag71xx *ag)
static int ag71xx_open(struct net_device *dev)
{
struct ag71xx *ag = netdev_priv(dev);
- struct ag71xx_platform_data *pdata = ag71xx_get_pdata(ag);
int ret;
ret = ag71xx_rings_init(ag);
if (ret)
goto err;
- if (pdata->is_ar724x)
- ag71xx_hw_init(ag);
-
napi_enable(&ag->napi);
netif_carrier_off(dev);
@@ -747,8 +743,13 @@ static void ag71xx_tx_timeout(struct net_device *dev)
static void ag71xx_restart_work_func(struct work_struct *work)
{
struct ag71xx *ag = container_of(work, struct ag71xx, restart_work);
+ struct ag71xx_platform_data *pdata = ag71xx_get_pdata(ag);
ag71xx_stop(ag->dev);
+
+ if (pdata->is_ar724x)
+ ag71xx_hw_init(ag);
+
ag71xx_open(ag->dev);
}