aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2010-03-05 20:29:22 +0000
committerGabor Juhos <juhosg@openwrt.org>2010-03-05 20:29:22 +0000
commited0bf18b3a7ff29ee414dc3d08f1630702478256 (patch)
tree475fdb7bdd9e32a3cc635868473c4411d5c5fada
parent8fe8275c5c5fa154aa431c65c32cb3b863e24854 (diff)
downloadupstream-ed0bf18b3a7ff29ee414dc3d08f1630702478256.tar.gz
upstream-ed0bf18b3a7ff29ee414dc3d08f1630702478256.tar.bz2
upstream-ed0bf18b3a7ff29ee414dc3d08f1630702478256.zip
ar71xx: ag71xx: move calling ag71xx_phy_stop out from spinlock
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@20004 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_main.c6
1 files changed, 3 insertions, 3 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 3644b2dd91..06a1f67d88 100644
--- a/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_main.c
+++ b/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_main.c
@@ -580,15 +580,15 @@ static int ag71xx_stop(struct net_device *dev)
struct ag71xx *ag = netdev_priv(dev);
unsigned long flags;
+ netif_carrier_off(dev);
+ ag71xx_phy_stop(ag);
+
spin_lock_irqsave(&ag->lock, flags);
netif_stop_queue(dev);
ag71xx_hw_stop(ag);
- netif_carrier_off(dev);
- ag71xx_phy_stop(ag);
-
napi_disable(&ag->napi);
del_timer_sync(&ag->oom_timer);