summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Chulski <stefanc@marvell.com>2019-09-05 12:46:18 -0400
committerDavid S. Miller <davem@davemloft.net>2019-09-07 11:26:13 -0400
commit63b2ed4e10b2e6c913e1d8cdd728e7fba4115a3d (patch)
tree6d3c7ab6dfdbb2f959c40c8f2d6cd8c4a192cfa1
parentb82573fdbef809803d06295f318f7ad1a2c5ceb9 (diff)
net: phylink: Fix flow control resolution
Regarding to IEEE 802.3-2015 standard section 2 28B.3 Priority resolution - Table 28-3 - Pause resolution In case of Local device Pause=1 AsymDir=0, Link partner Pause=1 AsymDir=1, Local device resolution should be enable PAUSE transmit, disable PAUSE receive. And in case of Local device Pause=1 AsymDir=1, Link partner Pause=1 AsymDir=0, Local device resolution should be enable PAUSE receive, disable PAUSE transmit. Fixes: 9525ae83959b ("phylink: add phylink infrastructure") Signed-off-by: Stefan Chulski <stefanc@marvell.com> Reported-by: Shaul Ben-Mayor <shaulb@marvell.com> Acked-by: Russell King <rmk+kernel@armlinux.org.uk> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/phy/phylink.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/phy/phylink.c b/drivers/net/phy/phylink.c
index a45c5de96ab1..a5a57ca94c1a 100644
--- a/drivers/net/phy/phylink.c
+++ b/drivers/net/phy/phylink.c
@@ -376,8 +376,8 @@ static void phylink_get_fixed_state(struct phylink *pl, struct phylink_link_stat
376 * Local device Link partner 376 * Local device Link partner
377 * Pause AsymDir Pause AsymDir Result 377 * Pause AsymDir Pause AsymDir Result
378 * 1 X 1 X TX+RX 378 * 1 X 1 X TX+RX
379 * 0 1 1 1 RX 379 * 0 1 1 1 TX
380 * 1 1 0 1 TX 380 * 1 1 0 1 RX
381 */ 381 */
382static void phylink_resolve_flow(struct phylink *pl, 382static void phylink_resolve_flow(struct phylink *pl,
383 struct phylink_link_state *state) 383 struct phylink_link_state *state)
@@ -398,7 +398,7 @@ static void phylink_resolve_flow(struct phylink *pl,
398 new_pause = MLO_PAUSE_TX | MLO_PAUSE_RX; 398 new_pause = MLO_PAUSE_TX | MLO_PAUSE_RX;
399 else if (pause & MLO_PAUSE_ASYM) 399 else if (pause & MLO_PAUSE_ASYM)
400 new_pause = state->pause & MLO_PAUSE_SYM ? 400 new_pause = state->pause & MLO_PAUSE_SYM ?
401 MLO_PAUSE_RX : MLO_PAUSE_TX; 401 MLO_PAUSE_TX : MLO_PAUSE_RX;
402 } else { 402 } else {
403 new_pause = pl->link_config.pause & MLO_PAUSE_TXRX_MASK; 403 new_pause = pl->link_config.pause & MLO_PAUSE_TXRX_MASK;
404 } 404 }