When connecting a PHY to phylink use the detected interface. Otherwise, the link fails to come up when the configured 'phy-mode' differs from the SFP detected mode.
This fixes 1GB SFP module link up on eth3 of the Macchiatobin board that is configured in the DT to "2500base-x" phy-mode. Fixes: 9525ae83959b6 ("phylink: add phylink infrastructure") Suggested-by: Russell King <rmk+ker...@armlinux.org.uk> Signed-off-by: Baruch Siach <bar...@tkos.co.il> --- drivers/net/phy/phylink.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/phy/phylink.c b/drivers/net/phy/phylink.c index 3ba5cf2a8a5f..aa745decc81d 100644 --- a/drivers/net/phy/phylink.c +++ b/drivers/net/phy/phylink.c @@ -738,7 +738,7 @@ int phylink_connect_phy(struct phylink *pl, struct phy_device *phy) if (WARN_ON(pl->link_an_mode == MLO_AN_FIXED || (pl->link_an_mode == MLO_AN_INBAND && - phy_interface_mode_is_8023z(pl->link_interface)))) + phy_interface_mode_is_8023z(pl->link_config.interface)))) return -EINVAL; if (pl->phydev) @@ -750,7 +750,7 @@ int phylink_connect_phy(struct phylink *pl, struct phy_device *phy) pl->link_config.interface = pl->link_interface; } - ret = phy_attach_direct(pl->netdev, phy, 0, pl->link_interface); + ret = phy_attach_direct(pl->netdev, phy, 0, pl->link_config.interface); if (ret) return ret; -- 2.19.0