| 12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455565758596061626364 |
- From 4b624a39f2ab523ca6a6ad9448fab1deb7b101e2 Mon Sep 17 00:00:00 2001
- From: "Russell King (Oracle)" <[email protected]>
- Date: Tue, 23 May 2023 11:15:53 +0100
- Subject: [PATCH 17/21] net: phylink: remove duplicated linkmode pause
- resolution
- Phylink had two chunks of code virtually the same for resolving the
- negotiated pause modes. Factor this down to one function.
- Reviewed-by: Andrew Lunn <[email protected]>
- Signed-off-by: Russell King (Oracle) <[email protected]>
- Signed-off-by: Jakub Kicinski <[email protected]>
- ---
- drivers/net/phy/phylink.c | 15 ++++-----------
- 1 file changed, 4 insertions(+), 11 deletions(-)
- --- a/drivers/net/phy/phylink.c
- +++ b/drivers/net/phy/phylink.c
- @@ -976,11 +976,10 @@ static void phylink_apply_manual_flow(st
- state->pause = pl->link_config.pause;
- }
-
- -static void phylink_resolve_flow(struct phylink_link_state *state)
- +static void phylink_resolve_an_pause(struct phylink_link_state *state)
- {
- bool tx_pause, rx_pause;
-
- - state->pause = MLO_PAUSE_NONE;
- if (state->duplex == DUPLEX_FULL) {
- linkmode_resolve_pause(state->advertising,
- state->lp_advertising,
- @@ -1192,7 +1191,8 @@ static void phylink_get_fixed_state(stru
- else if (pl->link_gpio)
- state->link = !!gpiod_get_value_cansleep(pl->link_gpio);
-
- - phylink_resolve_flow(state);
- + state->pause = MLO_PAUSE_NONE;
- + phylink_resolve_an_pause(state);
- }
-
- static void phylink_mac_initial_config(struct phylink *pl, bool force_restart)
- @@ -3215,7 +3215,6 @@ static const struct sfp_upstream_ops sfp
- static void phylink_decode_c37_word(struct phylink_link_state *state,
- uint16_t config_reg, int speed)
- {
- - bool tx_pause, rx_pause;
- int fd_bit;
-
- if (speed == SPEED_2500)
- @@ -3234,13 +3233,7 @@ static void phylink_decode_c37_word(stru
- state->link = false;
- }
-
- - 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;
- + phylink_resolve_an_pause(state);
- }
-
- static void phylink_decode_sgmii_word(struct phylink_link_state *state,
|
