Commit dc7a5141 authored by Russell King (Oracle)'s avatar Russell King (Oracle) Committed by Jakub Kicinski
Browse files

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: default avatarAndrew Lunn <andrew@lunn.ch>
Signed-off-by: default avatarRussell King (Oracle) <rmk+kernel@armlinux.org.uk>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent e9261467

drivers/net/phy/phylink.c

+4 −11
Original line number Diff line number Diff line
@@ -977,11 +977,10 @@ static void phylink_apply_manual_flow(struct phylink *pl, 
		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,
@@ -1193,7 +1192,8 @@ static void phylink_get_fixed_state(struct phylink *pl, 
	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_phylink_ops = { 
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(struct phylink_link_state *state, 
		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,