Commit aa951feb authored by Heiner Kallweit's avatar Heiner Kallweit Committed by Jakub Kicinski
Browse files

net: phy: c45: Don't silently remove disabled EEE modes any longer when... 


net: phy: c45: Don't silently remove disabled EEE modes any longer when writing advertisement register

advertising_eee is adjusted now whenever an EEE mode gets disabled.
Therefore we can remove the silent removal of disabled EEE modes here.

Signed-off-by: default avatarHeiner Kallweit <hkallweit1@gmail.com>
Reviewed-by: default avatarRussell King (Oracle) <rmk+kernel@armlinux.org.uk>
Link: https://patch.msgid.link/e95b9dad-24a7-4e3e-9af9-6f0770cf1520@gmail.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 7f33fea6

drivers/net/phy/phy-c45.c

+2 −5
Original line number Diff line number Diff line
@@ -683,13 +683,10 @@ EXPORT_SYMBOL_GPL(genphy_c45_read_mdix); 
static int genphy_c45_write_eee_adv(struct phy_device *phydev,

				    unsigned long *adv)

{

	__ETHTOOL_DECLARE_LINK_MODE_MASK(tmp);

	int val, changed = 0;



	linkmode_andnot(tmp, adv, phydev->eee_disabled_modes);



	if (linkmode_intersects(phydev->supported_eee, PHY_EEE_CAP1_FEATURES)) {

		val = linkmode_to_mii_eee_cap1_t(tmp);

		val = linkmode_to_mii_eee_cap1_t(adv);



		/* IEEE 802.3-2018 45.2.7.13 EEE advertisement 1

		 * (Register 7.60)
@@ -707,7 +704,7 @@ static int genphy_c45_write_eee_adv(struct phy_device *phydev, 
	}



	if (linkmode_intersects(phydev->supported_eee, PHY_EEE_CAP2_FEATURES)) {

		val = linkmode_to_mii_eee_cap2_t(tmp);

		val = linkmode_to_mii_eee_cap2_t(adv);



		/* IEEE 802.3-2022 45.2.7.16 EEE advertisement 2

		 * (Register 7.62)