From f0e193ff7a1774a93ab78157e99c3787a554dd9e Mon Sep 17 00:00:00 2001
From: Emil Tantilov <emil.s.tantilov@intel.com>
Date: Tue, 16 Aug 2011 08:04:11 +0000
Subject: [PATCH] --- yaml --- r: 266175 b: refs/heads/master c:
 8c838d7384c6e5c0583ec6bbb2e6f6dba19feda1 h: refs/heads/master i:   266173:
 7d6e4ba7284a31506faddd24b6a8bab4309eeb7f   266171:
 9f0bbcbb241a8d7f004ba8241d24d4d8d6b87a72   266167:
 77fcd014cfc9106d47da9ce51bd2914f85f16dfc   266159:
 b1e02f9db19612860032e71d94cfd38925030efb   266143:
 60a6e3df2e6d9775d1dd154183ab2fbb49c59d3e   266111:
 a76b342847cf316ec0334607d603fb805f212792 v: v3

---
 [refs]                                        |  2 +-
 .../net/ethernet/intel/ixgbe/ixgbe_x540.c     | 19 ++-----------------
 2 files changed, 3 insertions(+), 18 deletions(-)

diff --git a/[refs] b/[refs]
index 1bd7c5af68d2..ede722ecc4f5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c23f5b6bbb5ba73cafdb354dcace17426fef4d38
+refs/heads/master: 8c838d7384c6e5c0583ec6bbb2e6f6dba19feda1
diff --git a/trunk/drivers/net/ethernet/intel/ixgbe/ixgbe_x540.c b/trunk/drivers/net/ethernet/intel/ixgbe/ixgbe_x540.c
index 84bb51d08e59..96e0b2083198 100644
--- a/trunk/drivers/net/ethernet/intel/ixgbe/ixgbe_x540.c
+++ b/trunk/drivers/net/ethernet/intel/ixgbe/ixgbe_x540.c
@@ -93,10 +93,8 @@ static s32 ixgbe_setup_mac_link_X540(struct ixgbe_hw *hw,
  **/
 static s32 ixgbe_reset_hw_X540(struct ixgbe_hw *hw)
 {
-	ixgbe_link_speed link_speed;
 	s32 status;
 	u32 ctrl, i;
-	bool link_up = false;
 
 	/* Call adapter stop to disable tx/rx and clear interrupts */
 	status = hw->mac.ops.stop_adapter(hw);
@@ -107,19 +105,7 @@ static s32 ixgbe_reset_hw_X540(struct ixgbe_hw *hw)
 	ixgbe_clear_tx_pending(hw);
 
 mac_reset_top:
-	/*
-	 * Issue global reset to the MAC.  Needs to be SW reset if link is up.
-	 * If link reset is used when link is up, it might reset the PHY when
-	 * mng is using it.  If link is down or the flag to force full link
-	 * reset is set, then perform link reset.
-	 */
-	ctrl = IXGBE_CTRL_LNK_RST;
-	if (!hw->force_full_reset) {
-		hw->mac.ops.check_link(hw, &link_speed, &link_up, false);
-		if (link_up)
-			ctrl = IXGBE_CTRL_RST;
-	}
-
+	ctrl = IXGBE_CTRL_RST;
 	ctrl |= IXGBE_READ_REG(hw, IXGBE_CTRL);
 	IXGBE_WRITE_REG(hw, IXGBE_CTRL, ctrl);
 	IXGBE_WRITE_FLUSH(hw);
@@ -136,8 +122,7 @@ static s32 ixgbe_reset_hw_X540(struct ixgbe_hw *hw)
 		status = IXGBE_ERR_RESET_FAILED;
 		hw_dbg(hw, "Reset polling failed to complete.\n");
 	}
-
-	msleep(50);
+	msleep(100);
 
 	/*
 	 * Double resets are required for recovery from certain error