diff options
author | Russell King (Oracle) <rmk+kernel@armlinux.org.uk> | 2021-10-28 15:55:34 +0100 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-11-17 09:48:40 +0100 |
commit | 9be9cb2a2be4f720a64c8c887934f11c8f4a1253 (patch) | |
tree | 2b5e1f7373f602dd23fbe1672687413d0d664321 /drivers/net/phy/phylink.c | |
parent | 077410c7907cb633502c97a3f4e7b897087d0c32 (diff) | |
download | linux-stable-9be9cb2a2be4f720a64c8c887934f11c8f4a1253.tar.gz linux-stable-9be9cb2a2be4f720a64c8c887934f11c8f4a1253.tar.bz2 linux-stable-9be9cb2a2be4f720a64c8c887934f11c8f4a1253.zip |
net: phylink: avoid mvneta warning when setting pause parameters
[ Upstream commit fd8d9731bcdfb22d28e45bce789bcb211c868c78 ]
mvneta does not support asymetric pause modes, and it flags this by the
lack of AsymPause in the supported field. When setting pause modes, we
check that pause->rx_pause == pause->tx_pause, but only when pause
autoneg is enabled. When pause autoneg is disabled, we still allow
pause->rx_pause != pause->tx_pause, which is incorrect when the MAC
does not support asymetric pause, and causes mvneta to issue a warning.
Fix this by removing the test for pause->autoneg, so we always check
that pause->rx_pause == pause->tx_pause for network devices that do not
support AsymPause.
Fixes: 9525ae83959b ("phylink: add phylink infrastructure")
Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'drivers/net/phy/phylink.c')
-rw-r--r-- | drivers/net/phy/phylink.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/phy/phylink.c b/drivers/net/phy/phylink.c index bf5bbb565cf5..7be43a1eaefd 100644 --- a/drivers/net/phy/phylink.c +++ b/drivers/net/phy/phylink.c @@ -1331,7 +1331,7 @@ int phylink_ethtool_set_pauseparam(struct phylink *pl, return -EOPNOTSUPP; if (!phylink_test(pl->supported, Asym_Pause) && - !pause->autoneg && pause->rx_pause != pause->tx_pause) + pause->rx_pause != pause->tx_pause) return -EINVAL; config->pause &= ~(MLO_PAUSE_AN | MLO_PAUSE_TXRX_MASK); |