mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-27 03:10:12 +00:00
net: pcs: xpcs: correct pause resolution
xpcs was indicating symmetric pause should be enabled regardless of the advertisements by either party. Fix this to use linkmode_resolve_pause() now that we're no longer obliterating the link partner's advertisement by logically anding it with our own. This is transitional, the function will be entirely replaced with phylink_resolve_c73() in the following patch. Reviewed-by: Andrew Lunn <andrew@lunn.ch> Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk> Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
parent
1f94ba198b
commit
428d603fca
1 changed files with 10 additions and 1 deletions
|
@ -538,11 +538,20 @@ static void xpcs_resolve_lpa_c73(struct dw_xpcs *xpcs,
|
|||
struct phylink_link_state *state)
|
||||
{
|
||||
__ETHTOOL_DECLARE_LINK_MODE_MASK(res);
|
||||
bool tx_pause, rx_pause;
|
||||
|
||||
/* Calculate the union of the advertising masks */
|
||||
linkmode_and(res, state->lp_advertising, state->advertising);
|
||||
|
||||
state->pause = MLO_PAUSE_TX | MLO_PAUSE_RX;
|
||||
/* Resolve pause modes */
|
||||
linkmode_resolve_pause(state->advertising, state->lp_advertising,
|
||||
&tx_pause, &rx_pause);
|
||||
|
||||
if (tx_pause)
|
||||
state->pause |= MLO_PAUSE_TX;
|
||||
if (rx_pause)
|
||||
state->pause |= MLO_PAUSE_RX;
|
||||
|
||||
state->speed = xpcs_get_max_usxgmii_speed(res);
|
||||
state->duplex = DUPLEX_FULL;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue