Some SFPs may contain an internal PHY which may in some cases want to
connect with the host interface in 1000base-x/2500base-x mode.
Do not fail if such PHY is being attached in one of these PHY interface
modes.

Signed-off-by: Marek Behún <ka...@kernel.org>
Cc: Andrew Lunn <and...@lunn.ch>
Cc: Russell King <rmk+ker...@armlinux.org.uk>
---
 drivers/net/phy/phylink.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/phy/phylink.c b/drivers/net/phy/phylink.c
index 5d8c015bc9f2..52954f12ca5e 100644
--- a/drivers/net/phy/phylink.c
+++ b/drivers/net/phy/phylink.c
@@ -1018,7 +1018,7 @@ static int phylink_attach_phy(struct phylink *pl, struct 
phy_device *phy,
 {
        if (WARN_ON(pl->cfg_link_an_mode == MLO_AN_FIXED ||
                    (pl->cfg_link_an_mode == MLO_AN_INBAND &&
-                    phy_interface_mode_is_8023z(interface))))
+                    phy_interface_mode_is_8023z(interface) && !pl->sfp_bus)))
                return -EINVAL;
 
        if (pl->phydev)
-- 
2.26.2

Reply via email to