From 1700f1633cc5bc7bb991fcd4758ea0e2cb33a0fe Mon Sep 17 00:00:00 2001
From: Stephen Hemminger <shemminger@linux-foundation.org>
Date: Mon, 3 Dec 2007 17:02:17 -0800
Subject: [PATCH] --- yaml --- r: 74575 b: refs/heads/master c:
 8cfcbe998aa0459e20bbad61376f81c1715b25d6 h: refs/heads/master i:   74573:
 8d25ffecf00cee619b3536bc77b6d43c7627e4ff   74571:
 50259e1ef2bfc2e9ca4e0905a899e3d46277cfc2   74567:
 40d392066f757bcfa761fe55585a17ac814114b6   74559:
 0912f4b7342dd470533222f09c539145840ed3ba v: v3

---
 [refs]                   | 2 +-
 trunk/drivers/net/sky2.c | 6 ++----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 21c5389ca877..8a32a83581c6 100644
--- 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
index 3d1dfc948405..6197afb3ed83 100644
--- 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);