From 92d3af7d37111c418b78626574d7deb9c12db598 Mon Sep 17 00:00:00 2001
From: Alexander Duyck <alexander.h.duyck@intel.com>
Date: Fri, 6 Feb 2009 23:21:10 +0000
Subject: [PATCH] --- yaml --- r: 134343 b: refs/heads/master c:
 a8564f033efade1b6f027c4bb807cdf8cf5c9570 h: refs/heads/master i:   134341:
 1d0023d80272177851b522d8dec89521b7e608fc   134339:
 dedde506c6fc93d690305ecabefac48f7e65dc52   134335:
 0547c32da42854cb220272ce8d40ea2f4f64e95c v: v3

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

diff --git a/[refs] b/[refs]
index 53e88d696d93..91b0fd7b7040 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4a3c6433e48592f260278966742a99e0d77de3cc
+refs/heads/master: a8564f033efade1b6f027c4bb807cdf8cf5c9570
diff --git a/trunk/drivers/net/igb/igb_main.c b/trunk/drivers/net/igb/igb_main.c
index 56c14557cea3..accab3f7357e 100644
--- a/trunk/drivers/net/igb/igb_main.c
+++ b/trunk/drivers/net/igb/igb_main.c
@@ -4341,6 +4341,11 @@ static int igb_resume(struct pci_dev *pdev)
 	/* e1000_power_up_phy(adapter); */
 
 	igb_reset(adapter);
+
+	/* let the f/w know that the h/w is now under the control of the
+	 * driver. */
+	igb_get_hw_control(adapter);
+
 	wr32(E1000_WUS, ~0);
 
 	if (netif_running(netdev)) {
@@ -4351,10 +4356,6 @@ static int igb_resume(struct pci_dev *pdev)
 
 	netif_device_attach(netdev);
 
-	/* let the f/w know that the h/w is now under the control of the
-	 * driver. */
-	igb_get_hw_control(adapter);
-
 	return 0;
 }
 #endif