---

yaml --- r: 341673 b: refs/heads/master c: a0483e2 h: refs/heads/master i: 341671: 1068399 v: v3
git-mirror · Dec 1, 2012 · 2cc4d57 · 2cc4d57
1 parent b05684c
commit 2cc4d57
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7916a53d203f12461095886cf72d58e9281240d9
+refs/heads/master: a0483e2eb63d3b2f14a821edb21b3e610bfba5bd
diff --git a/trunk/drivers/net/ethernet/intel/igb/e1000_82575.c b/trunk/drivers/net/ethernet/intel/igb/e1000_82575.c
@@ -1927,6 +1927,12 @@ static s32 igb_reset_hw_82580(struct e1000_hw *hw)
 
 	hw->dev_spec._82575.global_device_reset = false;
 
+	/* due to hw errata, global device reset doesn't always
+	 * work on 82580
+	 */
+	if (hw->mac.type == e1000_82580)
+		global_device_reset = false;
+
 	/* Get current control state. */
 	ctrl = rd32(E1000_CTRL);