lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Message-ID: <f5521d12-bc72-8ed7-eeda-888185c6cee6@gmail.com> Date: Mon, 29 Apr 2019 22:14:10 +0200 From: Heiner Kallweit <hkallweit1@...il.com> To: Andrew Lunn <andrew@...n.ch>, Florian Fainelli <f.fainelli@...il.com>, David Miller <davem@...emloft.net> Cc: "netdev@...r.kernel.org" <netdev@...r.kernel.org> Subject: [PATCH net-next 2/2] net: phy: improve phy_set_sym_pause and phy_set_asym_pause We should consider what is supported, and we shouldn't mess with phydev->supported. In addition make sure that phy_set_sym_pause() clears the asym pause bit in phydev->advertising. In phy_set_sym_pause() use the same mechanism as in phy_set_asym_pause() to restart autoneg if needed. Signed-off-by: Heiner Kallweit <hkallweit1@...il.com> --- drivers/net/phy/phy_device.c | 28 ++++++++++++++++++++++------ 1 file changed, 22 insertions(+), 6 deletions(-) diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c index 544b98b34..eb430f2a8 100644 --- a/drivers/net/phy/phy_device.c +++ b/drivers/net/phy/phy_device.c @@ -2054,13 +2054,24 @@ EXPORT_SYMBOL(phy_support_asym_pause); void phy_set_sym_pause(struct phy_device *phydev, bool rx, bool tx, bool autoneg) { - linkmode_clear_bit(ETHTOOL_LINK_MODE_Pause_BIT, phydev->supported); + __ETHTOOL_DECLARE_LINK_MODE_MASK(oldadv); + bool sym_pause_supported; + + sym_pause_supported = linkmode_test_bit(ETHTOOL_LINK_MODE_Pause_BIT, + phydev->supported); + + linkmode_copy(oldadv, phydev->advertising); - if (rx && tx && autoneg) + linkmode_clear_bit(ETHTOOL_LINK_MODE_Pause_BIT, phydev->advertising); + linkmode_clear_bit(ETHTOOL_LINK_MODE_Asym_Pause_BIT, + phydev->advertising); + + if (rx && tx && autoneg && sym_pause_supported) linkmode_set_bit(ETHTOOL_LINK_MODE_Pause_BIT, - phydev->supported); + phydev->advertising); - linkmode_copy(phydev->advertising, phydev->supported); + if (!linkmode_equal(oldadv, phydev->advertising) && phydev->autoneg) + phy_start_aneg(phydev); } EXPORT_SYMBOL(phy_set_sym_pause); @@ -2078,6 +2089,11 @@ EXPORT_SYMBOL(phy_set_sym_pause); void phy_set_asym_pause(struct phy_device *phydev, bool rx, bool tx) { __ETHTOOL_DECLARE_LINK_MODE_MASK(oldadv); + bool asym_pause_supported; + + asym_pause_supported = + linkmode_test_bit(ETHTOOL_LINK_MODE_Asym_Pause_BIT, + phydev->supported); linkmode_copy(oldadv, phydev->advertising); @@ -2086,14 +2102,14 @@ void phy_set_asym_pause(struct phy_device *phydev, bool rx, bool tx) linkmode_clear_bit(ETHTOOL_LINK_MODE_Asym_Pause_BIT, phydev->advertising); - if (rx) { + if (rx && asym_pause_supported) { linkmode_set_bit(ETHTOOL_LINK_MODE_Pause_BIT, phydev->advertising); linkmode_set_bit(ETHTOOL_LINK_MODE_Asym_Pause_BIT, phydev->advertising); } - if (tx) + if (tx && asym_pause_supported) linkmode_change_bit(ETHTOOL_LINK_MODE_Asym_Pause_BIT, phydev->advertising); -- 2.21.0
Powered by blists - more mailing lists