i40e: rename 'change' variable to 'autoneg_changed'
authorAlan Brady <alan.brady@intel.com>
Thu, 5 Oct 2017 21:53:43 +0000 (14:53 -0700)
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>
Tue, 17 Oct 2017 17:48:51 +0000 (10:48 -0700)
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: Alan Brady <alan.brady@intel.com>
Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
drivers/net/ethernet/intel/i40e/i40e_ethtool.c

index 913ba91..9c70555 100644 (file)
@@ -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;