summaryrefslogtreecommitdiff
path: root/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
diff options
context:
space:
mode:
authorJosh Hay <joshua.a.hay@intel.com>2012-12-15 03:28:30 +0000
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>2013-01-31 21:57:19 -0800
commitfd0326f2cf9e5d1d3dbcf4ea0da9accc762c4e52 (patch)
tree3c6a942b800077123180dd3f764d1041d0648b44 /drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
parent99b76642ca28841fe71c870a3bfbcb164fe04388 (diff)
downloadolio-linux-3.10-fd0326f2cf9e5d1d3dbcf4ea0da9accc762c4e52.tar.xz
olio-linux-3.10-fd0326f2cf9e5d1d3dbcf4ea0da9accc762c4e52.zip
ixgbe: autoneg variable refactoring
Removes the autoneg parameter from the setup_link functions. Adds local variable autoneg to setup_link functions to be passed to get_link_capabilities functions if needed. Signed-off-by: Josh Hay <joshua.a.hay@intel.com> Tested-by: Phil Schmitt <phillip.j.schmitt@intel.com>
Diffstat (limited to 'drivers/net/ethernet/intel/ixgbe/ixgbe_main.c')
-rw-r--r--drivers/net/ethernet/intel/ixgbe/ixgbe_main.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
index d9142899676..ac41361f932 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
@@ -4012,7 +4012,7 @@ static int ixgbe_non_sfp_link_config(struct ixgbe_hw *hw)
goto link_cfg_out;
if (hw->mac.ops.setup_link)
- ret = hw->mac.ops.setup_link(hw, speed, autoneg, link_up);
+ ret = hw->mac.ops.setup_link(hw, speed, link_up);
link_cfg_out:
return ret;
}
@@ -5755,7 +5755,7 @@ static void ixgbe_sfp_link_config_subtask(struct ixgbe_adapter *adapter)
if ((!speed) && (hw->mac.ops.get_link_capabilities))
hw->mac.ops.get_link_capabilities(hw, &speed, &autoneg);
if (hw->mac.ops.setup_link)
- hw->mac.ops.setup_link(hw, speed, autoneg, true);
+ hw->mac.ops.setup_link(hw, speed, true);
adapter->flags |= IXGBE_FLAG_NEED_LINK_UPDATE;
adapter->link_check_timeout = jiffies;