aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/net/sky2.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c
index 3d1dfc94840..6197afb3ed8 100644
--- a/drivers/net/sky2.c
+++ b/drivers/net/sky2.c
@@ -2906,16 +2906,14 @@ static void sky2_restart(struct work_struct *work)
2906 int i, err; 2906 int i, err;
2907 2907
2908 rtnl_lock(); 2908 rtnl_lock();
2909 sky2_write32(hw, B0_IMSK, 0);
2910 sky2_read32(hw, B0_IMSK);
2911 napi_disable(&hw->napi);
2912
2913 for (i = 0; i < hw->ports; i++) { 2909 for (i = 0; i < hw->ports; i++) {
2914 dev = hw->dev[i]; 2910 dev = hw->dev[i];
2915 if (netif_running(dev)) 2911 if (netif_running(dev))
2916 sky2_down(dev); 2912 sky2_down(dev);
2917 } 2913 }
2918 2914
2915 napi_disable(&hw->napi);
2916 sky2_write32(hw, B0_IMSK, 0);
2919 sky2_reset(hw); 2917 sky2_reset(hw);
2920 sky2_write32(hw, B0_IMSK, Y2_IS_BASE); 2918 sky2_write32(hw, B0_IMSK, Y2_IS_BASE);
2921 napi_enable(&hw->napi); 2919 napi_enable(&hw->napi);