diff options
| author | Josh Hay | 2012-12-15 04:28:30 +0100 |
|---|---|---|
| committer | Jeff Kirsher | 2013-02-01 06:57:19 +0100 |
| commit | fd0326f2cf9e5d1d3dbcf4ea0da9accc762c4e52 (patch) | |
| tree | 3c6a942b800077123180dd3f764d1041d0648b44 /drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c | |
| parent | ixgbe: removed unused variable from setup_link_speed (diff) | |
| download | kernel-qcow2-linux-fd0326f2cf9e5d1d3dbcf4ea0da9accc762c4e52.tar.gz kernel-qcow2-linux-fd0326f2cf9e5d1d3dbcf4ea0da9accc762c4e52.tar.xz kernel-qcow2-linux-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_ethtool.c')
| -rw-r--r-- | drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c index 1513b1052ee2..216203ece6ed 100644 --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c @@ -156,7 +156,7 @@ static int ixgbe_get_settings(struct net_device *netdev, struct ixgbe_hw *hw = &adapter->hw; ixgbe_link_speed supported_link; u32 link_speed = 0; - bool autoneg; + bool autoneg = false; bool link_up; hw->mac.ops.get_link_capabilities(hw, &supported_link, &autoneg); @@ -333,10 +333,10 @@ static int ixgbe_set_settings(struct net_device *netdev, return err; /* this sets the link speed and restarts auto-neg */ hw->mac.autotry_restart = true; - err = hw->mac.ops.setup_link(hw, advertised, true, true); + err = hw->mac.ops.setup_link(hw, advertised, true); if (err) { e_info(probe, "setup link failed with code %d\n", err); - hw->mac.ops.setup_link(hw, old, true, true); + hw->mac.ops.setup_link(hw, old, true); } } else { /* in this case we currently only support 10Gb/FULL */ |