Commit 6fc21a6e authored by Michael Sit Wei Hong's avatar Michael Sit Wei Hong Committed by David S. Miller

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: c8238631 ("stmmac: intel: prepare to support 1000BASE-X phy interface setting")
Signed-off-by: default avatarMichael Sit Wei Hong <michael.wei.hong.sit@intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent fe2cfbc9
...@@ -251,7 +251,6 @@ static void intel_speed_mode_2500(struct net_device *ndev, void *intel_data) ...@@ -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; priv->plat->mdio_bus_data->xpcs_an_inband = false;
} else { } else {
priv->plat->max_speed = 1000; priv->plat->max_speed = 1000;
priv->plat->mdio_bus_data->xpcs_an_inband = true;
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment