Commit 9be9cb2a authored Oct 28, 2021 by Russell King (Oracle) Committed by Greg Kroah-Hartman Nov 17, 2021

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: 9525ae83 ("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>

parent 077410c7

drivers/net/phy/phylink.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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);