Просмотр исходного кода

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
Felix Fietkau 15 лет назад
Родитель
Сommit
acbb3e50e7
1 измененных файлов с 5 добавлено и 4 удалено
  1. 5 4
      target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_main.c

+ 5 - 4
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)
 static int ag71xx_open(struct net_device *dev)
 {
 {
 	struct ag71xx *ag = netdev_priv(dev);
 	struct ag71xx *ag = netdev_priv(dev);
-	struct ag71xx_platform_data *pdata = ag71xx_get_pdata(ag);
 	int ret;
 	int ret;
 
 
 	ret = ag71xx_rings_init(ag);
 	ret = ag71xx_rings_init(ag);
 	if (ret)
 	if (ret)
 		goto err;
 		goto err;
 
 
-	if (pdata->is_ar724x)
-		ag71xx_hw_init(ag);
-
 	napi_enable(&ag->napi);
 	napi_enable(&ag->napi);
 
 
 	netif_carrier_off(dev);
 	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)
 static void ag71xx_restart_work_func(struct work_struct *work)
 {
 {
 	struct ag71xx *ag = container_of(work, struct ag71xx, restart_work);
 	struct ag71xx *ag = container_of(work, struct ag71xx, restart_work);
+	struct ag71xx_platform_data *pdata = ag71xx_get_pdata(ag);
 
 
 	ag71xx_stop(ag->dev);
 	ag71xx_stop(ag->dev);
+
+	if (pdata->is_ar724x)
+		ag71xx_hw_init(ag);
+
 	ag71xx_open(ag->dev);
 	ag71xx_open(ag->dev);
 }
 }