From 9cb1cbbb458872f557a1fcdf6e5b9475c37149fb Mon Sep 17 00:00:00 2001
From: Bruce Allan <bruce.w.allan@intel.com>
Date: Thu, 22 Oct 2009 21:22:18 -0700
Subject: [PATCH] --- yaml --- r: 167932 b: refs/heads/master c:
 74eee2e8d08048c847d1998c686e12a477ff939a h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 391d34a3e769..5d1636cf7354 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2bd9af046fdc10703b266b0f3b25423f0b7d703e
+refs/heads/master: 74eee2e8d08048c847d1998c686e12a477ff939a
diff --git a/trunk/drivers/net/e1000e/ich8lan.c b/trunk/drivers/net/e1000e/ich8lan.c
index 99df2abf82a9..aa0ab0eb8c7d 100644
--- a/trunk/drivers/net/e1000e/ich8lan.c
+++ b/trunk/drivers/net/e1000e/ich8lan.c
@@ -2843,9 +2843,8 @@ void e1000e_disable_gig_wol_ich8lan(struct e1000_hw *hw)
 		            E1000_PHY_CTRL_GBE_DISABLE;
 		ew32(PHY_CTRL, phy_ctrl);
 
-		/* Workaround SWFLAG unexpectedly set during S0->Sx */
 		if (hw->mac.type == e1000_pchlan)
-			udelay(500);
+			e1000_phy_hw_reset_ich8lan(hw);
 	default:
 		break;
 	}