diff options
| author | Russell King <rmk+kernel@armlinux.org.uk> | 2020-02-15 15:49:58 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-02-16 19:39:45 -0800 |
| commit | f904f15ea9b5c379d58e3c7d85862baf1adf7370 (patch) | |
| tree | 8fce6791bb2fc7c40f738ab9b5b5fcc35034a061 /drivers/net/phy | |
| parent | 4e5aeb4157c879a021e6d92373dc7e4684ebd8c0 (diff) | |
net: phylink: allow ethtool -A to change flow control advertisement
When ethtool -A is used to change the pause modes, the pause
advertisement is not being changed, but the documentation in
uapi/linux/ethtool.h says we should be. Add that capability to
phylink.
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/phy')
| -rw-r--r-- | drivers/net/phy/phylink.c | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/drivers/net/phy/phylink.c b/drivers/net/phy/phylink.c index c29648b90ce7..ab72bd1a7dca 100644 --- a/drivers/net/phy/phylink.c +++ b/drivers/net/phy/phylink.c @@ -1385,6 +1385,7 @@ int phylink_ethtool_set_pauseparam(struct phylink *pl, !pause->autoneg && pause->rx_pause != pause->tx_pause) return -EINVAL; + mutex_lock(&pl->state_mutex); config->pause = 0; if (pause->autoneg) config->pause |= MLO_PAUSE_AN; @@ -1393,6 +1394,22 @@ int phylink_ethtool_set_pauseparam(struct phylink *pl, if (pause->tx_pause) config->pause |= MLO_PAUSE_TX; + /* + * See the comments for linkmode_set_pause(), wrt the deficiencies + * with the current implementation. A solution to this issue would + * be: + * ethtool Local device + * rx tx Pause AsymDir + * 0 0 0 0 + * 1 0 1 1 + * 0 1 0 1 + * 1 1 1 1 + * and then use the ethtool rx/tx enablement status to mask the + * rx/tx pause resolution. + */ + linkmode_set_pause(config->advertising, pause->tx_pause, + pause->rx_pause); + /* If we have a PHY, phylib will call our link state function if the * mode has changed, which will trigger a resolve and update the MAC * configuration. @@ -1405,6 +1422,7 @@ int phylink_ethtool_set_pauseparam(struct phylink *pl, phylink_mac_config(pl, &pl->link_config); phylink_mac_an_restart(pl); } + mutex_unlock(&pl->state_mutex); return 0; } |