| From ddfce4f28b42b1ee1ef2ea18cf7d09c8a3bff5a0 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Thu, 28 Oct 2021 15:55:34 +0100 |
| Subject: net: phylink: avoid mvneta warning when setting pause parameters |
| |
| From: Russell King (Oracle) <rmk+kernel@armlinux.org.uk> |
| |
| [ 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> |
| --- |
| drivers/net/phy/phylink.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| diff --git a/drivers/net/phy/phylink.c b/drivers/net/phy/phylink.c |
| index bf5bbb565cf5e..7be43a1eaefda 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); |
| -- |
| 2.33.0 |
| |
