net: phylink: rename ovr_an_inband to default_an_inband

Since ovr_an_inband no longer overrides every MLO_AN_xxx mode, rename
it to reflect what it now does - it changes the default mode from
MLO_AN_PHY to MLO_AN_INBAND. Fix up the two users of this.

Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
Reviewed-by: Andrew Halaney <ahalaney@redhat.com>
Link: https://lore.kernel.org/r/E1sCJMv-00Ecr1-Sk@rmk-PC.armlinux.org.uk
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/ethernet/freescale/fman/fman_memac.c b/drivers/net/ethernet/freescale/fman/fman_memac.c
index 92b8f4ab26f1d7392b76ebf11080b2331bb65876..9c44a3581950bc887b9aec07904aecdaa3bf0a98 100644 (file)
--- a/drivers/net/ethernet/freescale/fman/fman_memac.c
+++ b/drivers/net/ethernet/freescale/fman/fman_memac.c
@@ -1232,7 +1232,7 @@ int memac_initialization(struct mac_device *mac_dev,
            !of_property_read_bool(mac_node, "managed") &&
            mac_dev->phy_if != PHY_INTERFACE_MODE_MII &&
            !phy_interface_mode_is_rgmii(mac_dev->phy_if))
-               mac_dev->phylink_config.ovr_an_inband = true;
+               mac_dev->phylink_config.default_an_inband = true;
        of_node_put(fixed);
 
        err = memac_init(mac_dev->fman_mac);

diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
index ca19b232431a5e0bb07b9efce18c7d9ce5b6f390..488b2fd2349cb216508b9409c98fdf3c39abdacd 100644 (file)
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
@@ -1221,7 +1221,7 @@ static int stmmac_phy_setup(struct stmmac_priv *priv)
 
        mdio_bus_data = priv->plat->mdio_bus_data;
        if (mdio_bus_data)
-               priv->phylink_config.ovr_an_inband =
+               priv->phylink_config.default_an_inband =
                        mdio_bus_data->xpcs_an_inband;
 
        /* Set the platform/firmware specified interface mode. Note, phylink

diff --git a/drivers/net/phy/phylink.c b/drivers/net/phy/phylink.c
index c81f1c1ee67500eb111b3da15fcc7571d433a46d..02427378acfda1e9b6faeda242a80887da37bee1 100644 (file)
--- a/drivers/net/phy/phylink.c
+++ b/drivers/net/phy/phylink.c
@@ -885,7 +885,7 @@ static int phylink_parse_mode(struct phylink *pl,
        const char *managed;
        unsigned long caps;
 
-       if (pl->config->ovr_an_inband)
+       if (pl->config->default_an_inband)
                pl->cfg_link_an_mode = MLO_AN_INBAND;
 
        dn = fwnode_get_named_child_node(fwnode, "fixed-link");

diff --git a/include/linux/phylink.h b/include/linux/phylink.h
index 5ea6b2ad2396390ba7738ff8de36ef85595a378f..a30a692acc327dbf08485766dcd535cc9bbe9b48 100644 (file)
--- a/include/linux/phylink.h
+++ b/include/linux/phylink.h
@@ -141,7 +141,8 @@ enum phylink_op_type {
  * @mac_requires_rxc: if true, the MAC always requires a receive clock from PHY.
  *                    The PHY driver should start the clock signal as soon as
  *                    possible and avoid stopping it during suspend events.
- * @ovr_an_inband: if true, override PCS to MLO_AN_INBAND
+ * @default_an_inband: if true, defaults to MLO_AN_INBAND rather than
+ *                    MLO_AN_PHY. A fixed-link specification will override.
  * @get_fixed_state: callback to execute to determine the fixed link state,
  *                  if MAC link is at %MLO_AN_FIXED mode.
  * @supported_interfaces: bitmap describing which PHY_INTERFACE_MODE_xxx
@@ -154,7 +155,7 @@ struct phylink_config {
        bool poll_fixed_state;
        bool mac_managed_pm;
        bool mac_requires_rxc;
-       bool ovr_an_inband;
+       bool default_an_inband;
        void (*get_fixed_state)(struct phylink_config *config,
                                struct phylink_link_state *state);
        DECLARE_PHY_INTERFACE_MASK(supported_interfaces);