From 4e5cbe154135b68cafbcc42bcc13a3adec7ef42b Mon Sep 17 00:00:00 2001 From: Emil Tantilov Date: Wed, 19 Oct 2011 07:41:58 +0000 Subject: [PATCH] --- yaml --- r: 273527 b: refs/heads/master c: 232ef6bc451de2bc17c22fd116838cd89b94e1c1 h: refs/heads/master i: 273525: ac06546b484d4f7c45aee1acfe1a11f28655c204 273523: 7fc8df166d0b8b224eca1eec4a7ff76f9f0fdbb9 273519: b132a319d2a39a62a33fe1e84fb71815973cf44f v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 42367ec75e33..920392957f53 100644 --- 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 index 09b8e88b2999..b7abf43a877e 100644 --- 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);