diff options
| author | Michael Sit Wei Hong <michael.wei.hong.sit@intel.com> | 2023-03-30 11:14:04 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2023-03-31 10:23:41 +0200 |
| commit | 6fc21a6ed5953b1dd3a41ce7be1ea57f5ef8c081 (patch) | |
| tree | 7e35d1b3b7ed09e85953fb360187a5001df190a7 /drivers/net/ethernet/stmicro | |
| parent | net: stmmac: check if MAC needs to attach to a PHY (diff) | |
| download | linux-6fc21a6ed5953b1dd3a41ce7be1ea57f5ef8c081.tar.xz linux-6fc21a6ed5953b1dd3a41ce7be1ea57f5ef8c081.zip | |
net: stmmac: remove redundant fixup to support fixed-link mode
Currently, intel_speed_mode_2500() will fix-up xpcs_an_inband
to 1 if the underlying controller has a max speed of 1000Mbps.
The value has been initialized and modified if it is
a fixed-linked setup earlier.
This patch removes the fix-up to allow for fixed-linked setup
support. In stmmac_phy_setup(), ovr_an_inband is set based on
the value of xpcs_an_inband. Which in turn will return an
error in phylink_parse_mode() where MLO_AN_FIXED and
ovr_an_inband are both set.
Fixes: c82386310d95 ("stmmac: intel: prepare to support 1000BASE-X phy interface setting")
Signed-off-by: Michael Sit Wei Hong <michael.wei.hong.sit@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/stmicro')
| -rw-r--r-- | drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c index 13aa919633b4..ab9f876b6df7 100644 --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c @@ -251,7 +251,6 @@ static void intel_speed_mode_2500(struct net_device *ndev, void *intel_data) priv->plat->mdio_bus_data->xpcs_an_inband = false; } else { priv->plat->max_speed = 1000; - priv->plat->mdio_bus_data->xpcs_an_inband = true; } } |