From 2cc4d573cab9ed77a6899bb47012540a5f8d977c Mon Sep 17 00:00:00 2001
From: Carolyn Wyborny <carolyn.wyborny@intel.com>
Date: Thu, 22 Nov 2012 01:24:08 +0000
Subject: [PATCH] --- yaml --- r: 341673 b: refs/heads/master c:
 a0483e2eb63d3b2f14a821edb21b3e610bfba5bd h: refs/heads/master i:   341671:
 1068399e46621b093a89fb48c60dde4ba99de587 v: v3

---
 [refs]                                             | 2 +-
 trunk/drivers/net/ethernet/intel/igb/e1000_82575.c | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 7968aa95f075..17032af454cd 100644
--- 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
index 8c12dbd0d6ce..db40b68819d8 100644
--- 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);