From: Heiner Kallweit Date: Fri, 1 Nov 2024 19:35:41 +0000 (+0100) Subject: net: phy: respect cached advertising when re-enabling EEE X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=516a5f11eb97c68b4a5e8b3dc20ced1763b9e941;p=users%2Fdwmw2%2Flinux.git net: phy: respect cached advertising when re-enabling EEE 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 Link: https://patch.msgid.link/c75f7f8b-5571-429f-abd3-ce682d178a4b@gmail.com Signed-off-by: Jakub Kicinski --- diff --git a/drivers/net/phy/phy-c45.c b/drivers/net/phy/phy-c45.c index 5695935fdce97..8c4dd94c74956 100644 --- a/drivers/net/phy/phy-c45.c +++ b/drivers/net/phy/phy-c45.c @@ -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;