Skip to content

Commit 6fc21a6

Browse files
michaelsit-iotgdavem330
authored andcommitted
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: c823863 ("stmmac: intel: prepare to support 1000BASE-X phy interface setting") Signed-off-by: Michael Sit Wei Hong <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent fe2cfbc commit 6fc21a6

File tree

1 file changed

+0
-1
lines changed

1 file changed

+0
-1
lines changed

drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -251,7 +251,6 @@ static void intel_speed_mode_2500(struct net_device *ndev, void *intel_data)
251251
priv->plat->mdio_bus_data->xpcs_an_inband = false;
252252
} else {
253253
priv->plat->max_speed = 1000;
254-
priv->plat->mdio_bus_data->xpcs_an_inband = true;
255254
}
256255
}
257256

0 commit comments

Comments
 (0)