Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 430d172a authored by Yaniv Rosner's avatar Yaniv Rosner Committed by David S. Miller
Browse files

bnx2x: display the correct duplex value 



Prior to this fix, the driver reported the chip's active duplex state
is always 'full', even if using half-duplex mode.

Signed-off-by: default avatarYaniv Rosner <yaniv.rosner@broadcom.com>
Signed-off-by: default avatarYuval Mintz <yuvalmin@broadcom.com>
Signed-off-by: default avatarEilon Greenstein <eilong@broadcom.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 375944cb

drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c

+6 −4
Original line number Diff line number Diff line
@@ -5434,7 +5434,7 @@ static int bnx2x_get_link_speed_duplex(struct bnx2x_phy *phy, 
		switch (speed_mask) {

		case GP_STATUS_10M:

			vars->line_speed = SPEED_10;

			if (vars->duplex == DUPLEX_FULL)

			if (is_duplex == DUPLEX_FULL)

				vars->link_status |= LINK_10TFD;

			else

				vars->link_status |= LINK_10THD;
@@ -5442,7 +5442,7 @@ static int bnx2x_get_link_speed_duplex(struct bnx2x_phy *phy, 


		case GP_STATUS_100M:

			vars->line_speed = SPEED_100;

			if (vars->duplex == DUPLEX_FULL)

			if (is_duplex == DUPLEX_FULL)

				vars->link_status |= LINK_100TXFD;

			else

				vars->link_status |= LINK_100TXHD;
@@ -5451,7 +5451,7 @@ static int bnx2x_get_link_speed_duplex(struct bnx2x_phy *phy, 
		case GP_STATUS_1G:

		case GP_STATUS_1G_KX:

			vars->line_speed = SPEED_1000;

			if (vars->duplex == DUPLEX_FULL)

			if (is_duplex == DUPLEX_FULL)

				vars->link_status |= LINK_1000TFD;

			else

				vars->link_status |= LINK_1000THD;
@@ -5459,7 +5459,7 @@ static int bnx2x_get_link_speed_duplex(struct bnx2x_phy *phy, 


		case GP_STATUS_2_5G:

			vars->line_speed = SPEED_2500;

			if (vars->duplex == DUPLEX_FULL)

			if (is_duplex == DUPLEX_FULL)

				vars->link_status |= LINK_2500TFD;

			else

				vars->link_status |= LINK_2500THD;
@@ -5533,6 +5533,7 @@ static int bnx2x_link_settings_status(struct bnx2x_phy *phy, 


	if (gp_status & MDIO_GP_STATUS_TOP_AN_STATUS1_LINK_STATUS) {

		if (SINGLE_MEDIA_DIRECT(params)) {

			vars->duplex = duplex;

			bnx2x_flow_ctrl_resolve(phy, params, vars, gp_status);

			if (phy->req_line_speed == SPEED_AUTO_NEG)

				bnx2x_xgxs_an_resolve(phy, params, vars,
@@ -5627,6 +5628,7 @@ static int bnx2x_warpcore_read_status(struct bnx2x_phy *phy, 
					LINK_STATUS_PARALLEL_DETECTION_USED;

			}

			bnx2x_ext_phy_resolve_fc(phy, params, vars);

			vars->duplex = duplex;

		}

	}