diff --git a/[refs] b/[refs]
index 9e98062ac4b2..69aea32c78f2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c89c7112d347acc3f4a6fe1459bcb6de02594dc9
+refs/heads/master: e7fd9253d83703838953160ebb2899c5f6e2eee1
diff --git a/trunk/drivers/net/ixgbe/ixgbe_ethtool.c b/trunk/drivers/net/ixgbe/ixgbe_ethtool.c
index 6cf1c71ed7f1..bd7524e4a00c 100644
--- a/trunk/drivers/net/ixgbe/ixgbe_ethtool.c
+++ b/trunk/drivers/net/ixgbe/ixgbe_ethtool.c
@@ -1595,6 +1595,13 @@ static int ixgbe_setup_loopback_test(struct ixgbe_adapter *adapter)
 	struct ixgbe_hw *hw = &adapter->hw;
 	u32 reg_data;
 
+	/* X540 needs to set the MACC.FLU bit to force link up */
+	if (adapter->hw.mac.type == ixgbe_mac_X540) {
+		reg_data = IXGBE_READ_REG(&adapter->hw, IXGBE_MACC);
+		reg_data |= IXGBE_MACC_FLU;
+		IXGBE_WRITE_REG(&adapter->hw, IXGBE_MACC, reg_data);
+	}
+
 	/* right now we only support MAC loopback in the driver */
 	reg_data = IXGBE_READ_REG(&adapter->hw, IXGBE_HLREG0);
 	/* Setup MAC loopback */