---

yaml --- r: 74575 b: refs/heads/master c: 8cfcbe9 h: refs/heads/master i: 74573: 8d25ffe 74571: 50259e1 74567: 40d3920 74559: 0912f4b v: v3
git-mirror · Dec 4, 2007 · 1700f16 · 1700f16
1 parent adffb8d
commit 1700f16
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4c537e6371a9510c82eb96fb7e1e66017e0e2053
+refs/heads/master: 8cfcbe998aa0459e20bbad61376f81c1715b25d6
diff --git a/trunk/drivers/net/sky2.c b/trunk/drivers/net/sky2.c
@@ -2906,16 +2906,14 @@ static void sky2_restart(struct work_struct *work)
 	int i, err;
 
 	rtnl_lock();
-	sky2_write32(hw, B0_IMSK, 0);
-	sky2_read32(hw, B0_IMSK);
-	napi_disable(&hw->napi);
-
 	for (i = 0; i < hw->ports; i++) {
 		dev = hw->dev[i];
 		if (netif_running(dev))
 			sky2_down(dev);
 	}
 
+	napi_disable(&hw->napi);
+	sky2_write32(hw, B0_IMSK, 0);
 	sky2_reset(hw);
 	sky2_write32(hw, B0_IMSK, Y2_IS_BASE);
 	napi_enable(&hw->napi);