Commit 38298461 authored by Yuval Mintz's avatar Yuval Mintz Committed by David S. Miller
Browse files

bnx2x: ethtool now returns unknown speed/duplex 



Previously, unless both interface and link were up, ethtool returned
the requested speed/duplex when asked for the interface's settings.
This change will now enable the driver to answer correctly (i.e.,
return unknown as its answer).

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 9ce392d4

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

+18 −11
Original line number Diff line number Diff line
@@ -222,9 +222,8 @@ static int bnx2x_get_settings(struct net_device *dev, struct ethtool_cmd *cmd) 
		 (SUPPORTED_TP | SUPPORTED_FIBRE));

	cmd->advertising = bp->port.advertising[cfg_idx];



	if ((bp->state == BNX2X_STATE_OPEN) &&

	    !(bp->flags & MF_FUNC_DIS) &&

	    (bp->link_vars.link_up)) {

	if ((bp->state == BNX2X_STATE_OPEN) && (bp->link_vars.link_up)) {

		if (!(bp->flags & MF_FUNC_DIS)) {

			ethtool_cmd_speed_set(cmd, bp->link_vars.line_speed);

			cmd->duplex = bp->link_vars.duplex;

		} else {
@@ -233,8 +232,12 @@ static int bnx2x_get_settings(struct net_device *dev, struct ethtool_cmd *cmd) 
			cmd->duplex = bp->link_params.req_duplex[cfg_idx];

		}



	if (IS_MF(bp))

		if (IS_MF(bp) && !BP_NOMCP(bp))

			ethtool_cmd_speed_set(cmd, bnx2x_get_mf_speed(bp));

	} else {

		cmd->duplex = DUPLEX_UNKNOWN;

		ethtool_cmd_speed_set(cmd, SPEED_UNKNOWN);

	}



	cmd->port = bnx2x_get_port_type(bp);
@@ -309,6 +312,10 @@ static int bnx2x_set_settings(struct net_device *dev, struct ethtool_cmd *cmd) 


	speed = ethtool_cmd_speed(cmd);



	/* If recieved a request for an unknown duplex, assume full*/

	if (cmd->duplex == DUPLEX_UNKNOWN)

		cmd->duplex = DUPLEX_FULL;



	if (IS_MF_SI(bp)) {

		u32 part;

		u32 line_speed = bp->link_vars.line_speed;

CRA Git | Maintained and supported by SUSTech CRA and CCSE