diff options
| author | Marek Behún <kabel@kernel.org> | 2026-01-29 09:22:27 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2026-02-19 16:25:15 +0100 |
| commit | c0aa43f9c34ab50439e241e0f3abb4c84ecaca84 (patch) | |
| tree | 905d7d9e401aae61277c3752c9c6b3964ea5e1b3 /drivers/net/phy | |
| parent | 55835646da78e83e7ad06abd741ca8fd8c0b0ea7 (diff) | |
| download | linux-c0aa43f9c34ab50439e241e0f3abb4c84ecaca84.tar.gz linux-c0aa43f9c34ab50439e241e0f3abb4c84ecaca84.tar.bz2 linux-c0aa43f9c34ab50439e241e0f3abb4c84ecaca84.zip | |
net: sfp: Fix quirk for Ubiquiti U-Fiber Instant SFP module
commit adcbadfd8e05d3558c9cfaa783f17c645181165f upstream.
Commit fd580c9830316eda ("net: sfp: augment SFP parsing with
phy_interface_t bitmap") did not add augumentation for the interface
bitmap in the quirk for Ubiquiti U-Fiber Instant.
The subsequent commit f81fa96d8a6c7a77 ("net: phylink: use
phy_interface_t bitmaps for optical modules") then changed phylink code
for selection of SFP interface: instead of using link mode bitmap, the
interface bitmap is used, and the fastest interface mode supported by
both SFP module and MAC is chosen.
Since the interface bitmap contains also modes faster than 1000base-x,
this caused a regression wherein this module stopped working
out-of-the-box.
Fix this.
Fixes: fd580c9830316eda ("net: sfp: augment SFP parsing with phy_interface_t bitmap")
Signed-off-by: Marek Behún <kabel@kernel.org>
Reviewed-by: Maxime Chevallier <maxime.chevallier@bootlin.com>
Reviewed-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
Link: https://patch.msgid.link/20260129082227.17443-1-kabel@kernel.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/net/phy')
| -rw-r--r-- | drivers/net/phy/sfp.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/phy/sfp.c b/drivers/net/phy/sfp.c index 0666a39dc485..5cc3d53bbf66 100644 --- a/drivers/net/phy/sfp.c +++ b/drivers/net/phy/sfp.c @@ -376,6 +376,8 @@ static void sfp_quirk_ubnt_uf_instant(const struct sfp_eeprom_id *id, */ linkmode_zero(modes); linkmode_set_bit(ETHTOOL_LINK_MODE_1000baseX_Full_BIT, modes); + phy_interface_zero(interfaces); + __set_bit(PHY_INTERFACE_MODE_1000BASEX, interfaces); } #define SFP_QUIRK(_v, _p, _m, _f) \ |