net: phy: fix phy_validate_pause
Subsystems (3)
Heiner Kallweit
maintainerPATCH 1/1 net: phy: fix phy_validate_pause
We have valid scenarios where ETHTOOL_LINK_MODE_Pause_BIT doesn't need to be supported. Therefore extend the first check to check for rx_pause being set.
See also phy_set_asym_pause:
rx=0 and tx=1: advertise asym pause only
rx=0 and tx=0: stop advertising both pause modes
The fixed commit isn't wrong, it's just the one that introduced the linkmode bitmaps.
--- drivers/net/phy/phy_device.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-)
drivers/net/phy/phy_device.c +7 -4
@@ -2116,11 +2116,14 @@ bool phy_validate_pause(struct phy_device *phydev, struct ethtool_pauseparam *pp) {if (!linkmode_test_bit (ETHTOOL_LINK_MODE_Pause_BIT, - phydev->supported) || - (!linkmode_test_bit (ETHTOOL_LINK_MODE_Asym_Pause_BIT, - phydev->supported) && - pp->rx_pause != pp->tx_pause)) + phydev->supported) && pp->rx_pause)return false; + +if (!linkmode_test_bit (ETHTOOL_LINK_MODE_Asym_Pause_BIT, + phydev->supported) && + pp->rx_pause != pp->tx_pause) +return false; +return true; }EXPORT_SYMBOL (phy_validate_pause);
Signature · 1 line
2.21.0
David Miller
maintainerFrom: Heiner Kallweit <[email protected]>
Date: Wed, 1 May 2019 21:54:28 +0200
Quoted 8 lines
We have valid scenarios where
ETHTOOL_LINK_MODE_Pause_BITdoesn't need to be supported. Therefore extend the first check to check forrx_pausebeing set.See also
phy_set_asym_pause:
rx=0 and tx=1: advertise asym pause only
rx=0 and tx=0: stop advertising both pause modes
Quoted 5 lines
The fixed commit isn't wrong, it's just the one that introduced the linkmode bitmaps.
Fixes 3c1bcc8614db ("net: ethernet: Convert phydev advertize and supported from u32 to link mode")Signed-off-by Heiner Kallweit <[email protected]>
Applied and queued up for -stable.