tmakin/ack-tegra
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

net: stmmac: rename xpcs_an_inband to default_an_inband

Browse Source 
Rename xpcs_an_inband to default_an_inband to reflect the change in
phylink and its changed functionality.

Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
Reviewed-by: Andrew Halaney <ahalaney@redhat.com>
Link: https://lore.kernel.org/r/E1sCJN6-00EcrD-43@rmk-PC.armlinux.org.uk
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
Russell King (Oracle)
2024-05-29 14:29:40 +01:00
committed by Jakub Kicinski
parent 5e332954e7
commit 83f55b01dd
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c
+4 -4
View File
@@ -248,7 +248,7 @@ static void intel_speed_mode_2500(struct net_device *ndev, void *intel_data)
dev_info(priv->device, "Link Speed Mode: 2.5Gbps\n");
priv->plat->max_speed = 2500;
priv->plat->phy_interface = PHY_INTERFACE_MODE_2500BASEX;
priv->plat->mdio_bus_data->xpcs_an_inband = false;
priv->plat->mdio_bus_data->default_an_inband = false;
} else {
priv->plat->max_speed = 1000;
}
@@ -586,16 +586,16 @@ static int intel_mgbe_common_data(struct pci_dev *pdev,
if (plat->phy_interface == PHY_INTERFACE_MODE_SGMII ||
plat->phy_interface == PHY_INTERFACE_MODE_1000BASEX) {
plat->mdio_bus_data->has_xpcs = true;
plat->mdio_bus_data->xpcs_an_inband = true;
plat->mdio_bus_data->default_an_inband = true;
}
/* For fixed-link setup, we clear xpcs_an_inband */
/* For fixed-link setup, we clear default_an_inband */
if (fwnode) {
struct fwnode_handle *fixed_node;
fixed_node = fwnode_get_named_child_node(fwnode, "fixed-link");
if (fixed_node)
plat->mdio_bus_data->xpcs_an_inband = false;
plat->mdio_bus_data->default_an_inband = false;
fwnode_handle_put(fixed_node);
}
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
+1 -1
View File
@@ -1222,7 +1222,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.default_an_inband =
mdio_bus_data->xpcs_an_inband;
mdio_bus_data->default_an_inband;
/* Set the platform/firmware specified interface mode. Note, phylink
* deals with the PHY interface mode, not the MAC interface mode.
include/linux/stmmac.h
+1 -1
View File
@@ -83,7 +83,7 @@ struct stmmac_priv;
struct stmmac_mdio_bus_data {
unsigned int phy_mask;
unsigned int has_xpcs;
unsigned int xpcs_an_inband;
unsigned int default_an_inband;
int *irqs;
int probed_phy_irq;
bool needs_reset;