net: phylink: cleanup ksettings_set

We only need to fiddle about with the supported mask after we have
validated the user's requested parameters. Simplify and streamline the
code by moving the linkmode copy and update of the autoneg bit after
validating the user's request.

Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/phy/phylink.c b/drivers/net/phy/phylink.c
index 728eab380fd375cd3c0426050f789bd07fe4fc87..2cdf9f989decc0135691c4234de389f89307c9ce 100644 (file)
--- a/drivers/net/phy/phylink.c
+++ b/drivers/net/phy/phylink.c
@@ -1458,15 +1458,11 @@ int phylink_ethtool_ksettings_set(struct phylink *pl,
                return phy_ethtool_ksettings_set(pl->phydev, kset);
        }
 
-       linkmode_copy(support, pl->supported);
        config = pl->link_config;
-       config.an_enabled = kset->base.autoneg == AUTONEG_ENABLE;
 
-       /* Mask out unsupported advertisements, and force the autoneg bit */
+       /* Mask out unsupported advertisements */
        linkmode_and(config.advertising, kset->link_modes.advertising,
-                    support);
-       linkmode_mod_bit(ETHTOOL_LINK_MODE_Autoneg_BIT, config.advertising,
-                        config.an_enabled);
+                    pl->supported);
 
        /* FIXME: should we reject autoneg if phy/mac does not support it? */
        switch (kset->base.autoneg) {
@@ -1475,7 +1471,7 @@ int phylink_ethtool_ksettings_set(struct phylink *pl,
                 * duplex.
                 */
                s = phy_lookup_setting(kset->base.speed, kset->base.duplex,
-                                      support, false);
+                                      pl->supported, false);
                if (!s)
                        return -EINVAL;
 
@@ -1516,6 +1512,12 @@ int phylink_ethtool_ksettings_set(struct phylink *pl,
        /* We have ruled out the case with a PHY attached, and the
         * fixed-link cases.  All that is left are in-band links.
         */
+       config.an_enabled = kset->base.autoneg == AUTONEG_ENABLE;
+       linkmode_mod_bit(ETHTOOL_LINK_MODE_Autoneg_BIT, config.advertising,
+                        config.an_enabled);
+
+       /* Validate without changing the current supported mask. */
+       linkmode_copy(support, pl->supported);
        if (phylink_validate(pl, support, &config))
                return -EINVAL;