From: juhosg Date: Fri, 5 Mar 2010 20:29:22 +0000 (+0000) Subject: ar71xx: ag71xx: move calling ag71xx_phy_stop out from spinlock X-Git-Url: http://git.ozo.com/?p=openwrt-10.03%2F.git;a=commitdiff_plain;h=0955ccfcf3124640951de8ef3d1207da3a7cc2bc 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 --- 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 3644b2dd9..06a1f67d8 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);