ar71xx: frequent ethernet mac resets upset the MDIO bus on ar7240, so do not run...
authorFelix Fietkau <nbd@openwrt.org>
Sat, 2 Apr 2011 00:47:25 +0000 (00:47 +0000)
committerFelix Fietkau <nbd@openwrt.org>
Sat, 2 Apr 2011 00:47:25 +0000 (00:47 +0000)
SVN-Revision: 26392

target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_main.c

index 883489f26c386b648db18756d3052955b392c375..eae443e8ceea8ff84ea35f7201870e04a8a28908 100644 (file)
@@ -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);
 }