]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
net: phy: honor eee_disabled_modes in phy_advertise_eee_all()
authorNicolai Buchwitz <nb@tipi-net.de>
Mon, 18 May 2026 08:23:10 +0000 (10:23 +0200)
committerJakub Kicinski <kuba@kernel.org>
Wed, 20 May 2026 01:45:26 +0000 (18:45 -0700)
phy_advertise_eee_all() copies supported_eee into advertising_eee
unconditionally, overwriting any filtering applied during phy_probe()
based on DT eee-broken-* properties or driver-populated
eee_disabled_modes. genphy_c45_ethtool_set_eee() calls this helper
when user space passes an empty advertisement, undoing the filtering.

Apply the same eee_disabled_modes mask in phy_advertise_eee_all() so
the filtering survives the copy, matching the pattern in phy_probe()
and phy_support_eee().

Fixes: b64691274f5d ("net: phy: add helper phy_advertise_eee_all")
Signed-off-by: Nicolai Buchwitz <nb@tipi-net.de>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Link: https://patch.msgid.link/20260518-devel-phy-support-eee-fix-v2-2-05b52626fa68@tipi-net.de
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
drivers/net/phy/phy_device.c

index 83b074bc4a8f716b3e10c8ff57aff7c7abba0236..3370eb822017b264cfc26881b0eade8a49e1530f 100644 (file)
@@ -2877,7 +2877,8 @@ EXPORT_SYMBOL(phy_advertise_supported);
  */
 void phy_advertise_eee_all(struct phy_device *phydev)
 {
-       linkmode_copy(phydev->advertising_eee, phydev->supported_eee);
+       linkmode_andnot(phydev->advertising_eee, phydev->supported_eee,
+                       phydev->eee_disabled_modes);
 }
 EXPORT_SYMBOL_GPL(phy_advertise_eee_all);