Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 636b62d7 authored by Alan Brady's avatar Alan Brady Committed by Jeff Kirsher
Browse files

i40e: rename 'change' variable to 'autoneg_changed' 



This variable isn't actually very descriptive and makes the code a bit
confusing as to what it is being used for.  This patch enhances the
variable with the longer name, 'autoneg_changed', which makes it clear
we are concerned with autoneg changing in this context.

Signed-off-by: default avatarAlan Brady <alan.brady@intel.com>
Tested-by: default avatarAndrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 79f04a3a

drivers/net/ethernet/intel/i40e/i40e_ethtool.c

+6 −6
Original line number Diff line number Diff line
@@ -822,14 +822,14 @@ static int i40e_set_link_ksettings(struct net_device *netdev, 
{

	struct i40e_netdev_priv *np = netdev_priv(netdev);

	struct i40e_aq_get_phy_abilities_resp abilities;

	struct ethtool_link_ksettings safe_ks;

	struct ethtool_link_ksettings copy_ks;

	struct i40e_aq_set_phy_config config;

	struct i40e_pf *pf = np->vsi->back;

	struct i40e_vsi *vsi = np->vsi;

	struct i40e_hw *hw = &pf->hw;

	struct ethtool_link_ksettings safe_ks;

	struct ethtool_link_ksettings copy_ks;

	bool autoneg_changed = false;

	i40e_status status = 0;

	bool change = false;

	int timeout = 50;

	int err = 0;

	u32 autoneg;
@@ -922,7 +922,7 @@ static int i40e_set_link_ksettings(struct net_device *netdev, 
			/* Autoneg is allowed to change */

			config.abilities = abilities.abilities |

					   I40E_AQ_PHY_ENABLE_AN;

			change = true;

			autoneg_changed = true;

		}

	} else {

		/* If autoneg is currently enabled */
@@ -942,7 +942,7 @@ static int i40e_set_link_ksettings(struct net_device *netdev, 
			/* Autoneg is allowed to change */

			config.abilities = abilities.abilities &

					   ~I40E_AQ_PHY_ENABLE_AN;

			change = true;

			autoneg_changed = true;

		}

	}
@@ -976,7 +976,7 @@ static int i40e_set_link_ksettings(struct net_device *netdev, 
	 */

	if (!config.link_speed)

		config.link_speed = abilities.link_speed;

	if (change || (abilities.link_speed != config.link_speed)) {

	if (autoneg_changed || abilities.link_speed != config.link_speed) {

		/* copy over the rest of the abilities */

		config.phy_type = abilities.phy_type;

		config.phy_type_ext = abilities.phy_type_ext;