Commit 02d00dc7 authored by Russell King (Oracle)'s avatar Russell King (Oracle) Committed by Jakub Kicinski
Browse files

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: default avatarRussell King (Oracle) <rmk+kernel@armlinux.org.uk>
Reviewed-by: default avatarAndrew Halaney <ahalaney@redhat.com>
Link: https://lore.kernel.org/r/E1sCJMv-00Ecr1-Sk@rmk-PC.armlinux.org.uk


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent fea49f06

drivers/net/ethernet/freescale/fman/fman_memac.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

drivers/net/ethernet/stmicro/stmmac/stmmac_main.c

+1 −1
Original line number Diff line number Diff line
@@ -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

drivers/net/phy/phylink.c

+1 −1
Original line number Diff line number Diff line
@@ -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");

include/linux/phylink.h

+3 −2
Original line number Diff line number Diff line
@@ -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);