---

yaml --- r: 134343 b: refs/heads/master c: a8564f0 h: refs/heads/master i: 134341: 1d0023d 134339: dedde50 134335: 0547c32 v: v3
git-mirror · Feb 7, 2009 · 92d3af7 · 92d3af7
1 parent ca52b2c
commit 92d3af7
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git 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
@@ -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