Message ID | c75f7f8b-5571-429f-abd3-ce682d178a4b@gmail.com (mailing list archive) |
---|---|
State | Accepted |
Commit | 516a5f11eb97c68b4a5e8b3dc20ced1763b9e941 |
Delegated to: | Netdev Maintainers |
Headers | show |
Series | [net-next] net: phy: respect cached advertising when re-enabling EEE | expand |
Hello: This patch was applied to netdev/net-next.git (main) by Jakub Kicinski <kuba@kernel.org>: On Fri, 1 Nov 2024 20:35:41 +0100 you wrote: > 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> > > [...] Here is the summary with links: - [net-next] net: phy: respect cached advertising when re-enabling EEE https://git.kernel.org/netdev/net-next/c/516a5f11eb97 You are awesome, thank you!
diff --git a/drivers/net/phy/phy-c45.c b/drivers/net/phy/phy-c45.c index 5695935fd..8c4dd94c7 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;
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> --- drivers/net/phy/phy-c45.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)