]> www.infradead.org Git - users/dwmw2/linux.git/commitdiff
net: phy: respect cached advertising when re-enabling EEE
authorHeiner Kallweit <hkallweit1@gmail.com>
Fri, 1 Nov 2024 19:35:41 +0000 (20:35 +0100)
committerJakub Kicinski <kuba@kernel.org>
Thu, 7 Nov 2024 01:33:10 +0000 (17:33 -0800)
If we remove modes from EEE advertisement and disable / re-enable EEE,
then advertisement is set to all supported modes. I don't think this is
what the user expects. So respect the cached advertisement and just fall
back to all supported modes if cached advertisement is empty.

Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
Link: https://patch.msgid.link/c75f7f8b-5571-429f-abd3-ce682d178a4b@gmail.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
drivers/net/phy/phy-c45.c

index 5695935fdce97ea6a6fa8b8798a2fbe475b7fd0d..8c4dd94c74956325b152c3e70a85c96faf727558 100644 (file)
@@ -1568,11 +1568,10 @@ int genphy_c45_ethtool_set_eee(struct phy_device *phydev,
                                phydev_warn(phydev, "At least some EEE link modes are not supported.\n");
                                return -EINVAL;
                        }
-               } else {
-                       adv = phydev->supported_eee;
+                       linkmode_copy(phydev->advertising_eee, adv);
+               } else if (linkmode_empty(phydev->advertising_eee)) {
+                       phy_advertise_eee_all(phydev);
                }
-
-               linkmode_copy(phydev->advertising_eee, adv);
        }
 
        phydev->eee_enabled = data->eee_enabled;