---

yaml --- r: 273527 b: refs/heads/master c: 232ef6b h: refs/heads/master i: 273525: ac06546 273523: 7fc8df1 273519: b132a31 v: v3
git-mirror · Nov 2, 2011 · 4e5cbe1 · 4e5cbe1
1 parent 89650b5
commit 4e5cbe1
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d5a0e3640c05b7d07c548f9f8f986dbb87cfad98
+refs/heads/master: 232ef6bc451de2bc17c22fd116838cd89b94e1c1
diff --git a/trunk/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/trunk/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
@@ -6125,7 +6125,6 @@ static void ixgbe_sfp_link_config_subtask(struct ixgbe_adapter *adapter)
 	autoneg = hw->phy.autoneg_advertised;
 	if ((!autoneg) && (hw->mac.ops.get_link_capabilities))
 		hw->mac.ops.get_link_capabilities(hw, &autoneg, &negotiation);
-	hw->mac.autotry_restart = false;
 	if (hw->mac.ops.setup_link)
 		hw->mac.ops.setup_link(hw, autoneg, negotiation, true);