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

Commit b3337e4c authored by David Decotigny's avatar David Decotigny Committed by David S. Miller
Browse files

bnx2x: cosmetics: Using ethtool_cmd_speed() API 



This updates bnx2x to use the ethtool_cmd_speed() family of functions
(see b11f8d8c in 2.6.27-rc3 aka. "ethtool: Expand ethtool_cmd.speed to
32 bits") to get and set the link speed via ethtool. This allows to
avoid manually accessing ethtool_cmd's speed_hi field.

Signed-off-by: default avatarDavid Decotigny <decot@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent a01c1335

drivers/net/bnx2x/bnx2x_ethtool.c

+13 −12
Original line number Diff line number Diff line
@@ -167,6 +167,7 @@ static int bnx2x_get_settings(struct net_device *dev, struct ethtool_cmd *cmd) 
{

	struct bnx2x *bp = netdev_priv(dev);

	int cfg_idx = bnx2x_get_link_cfg_idx(bp);



	/* Dual Media boards present all available port types */

	cmd->supported = bp->port.supported[cfg_idx] |

		(bp->port.supported[cfg_idx ^ 1] &
@@ -176,16 +177,16 @@ static int bnx2x_get_settings(struct net_device *dev, struct ethtool_cmd *cmd) 
	if ((bp->state == BNX2X_STATE_OPEN) &&

	    !(bp->flags & MF_FUNC_DIS) &&

	    (bp->link_vars.link_up)) {

		cmd->speed = bp->link_vars.line_speed;

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

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

	} else {



		cmd->speed = bp->link_params.req_line_speed[cfg_idx];

		ethtool_cmd_speed_set(

			cmd, bp->link_params.req_line_speed[cfg_idx]);

		cmd->duplex = bp->link_params.req_duplex[cfg_idx];

	}



	if (IS_MF(bp))

		cmd->speed = bnx2x_get_mf_speed(bp);

		ethtool_cmd_speed_set(cmd, bnx2x_get_mf_speed(bp));



	if (bp->port.supported[cfg_idx] & SUPPORTED_TP)

		cmd->port = PORT_TP;
@@ -206,10 +207,11 @@ static int bnx2x_get_settings(struct net_device *dev, struct ethtool_cmd *cmd) 
	cmd->maxrxpkt = 0;



	DP(NETIF_MSG_LINK, "ethtool_cmd: cmd %d\n"

	   DP_LEVEL "  supported 0x%x  advertising 0x%x  speed %d\n"

	   DP_LEVEL "  supported 0x%x  advertising 0x%x  speed %u\n"

	   DP_LEVEL "  duplex %d  port %d  phy_address %d  transceiver %d\n"

	   DP_LEVEL "  autoneg %d  maxtxpkt %d  maxrxpkt %d\n",

	   cmd->cmd, cmd->supported, cmd->advertising, cmd->speed,

	   cmd->cmd, cmd->supported, cmd->advertising,

	   ethtool_cmd_speed(cmd),

	   cmd->duplex, cmd->port, cmd->phy_address, cmd->transceiver,

	   cmd->autoneg, cmd->maxtxpkt, cmd->maxrxpkt);
@@ -226,16 +228,15 @@ static int bnx2x_set_settings(struct net_device *dev, struct ethtool_cmd *cmd) 
		return 0;



	DP(NETIF_MSG_LINK, "ethtool_cmd: cmd %d\n"

	   "  supported 0x%x  advertising 0x%x  speed %d speed_hi %d\n"

	   "  supported 0x%x  advertising 0x%x  speed %u\n"

	   "  duplex %d  port %d  phy_address %d  transceiver %d\n"

	   "  autoneg %d  maxtxpkt %d  maxrxpkt %d\n",

	   cmd->cmd, cmd->supported, cmd->advertising, cmd->speed,

	   cmd->speed_hi,

	   cmd->cmd, cmd->supported, cmd->advertising,

	   ethtool_cmd_speed(cmd),

	   cmd->duplex, cmd->port, cmd->phy_address, cmd->transceiver,

	   cmd->autoneg, cmd->maxtxpkt, cmd->maxrxpkt);



	speed = cmd->speed;

	speed |= (cmd->speed_hi << 16);

	speed = ethtool_cmd_speed(cmd);



	if (IS_MF_SI(bp)) {

		u32 part;
@@ -439,7 +440,7 @@ static int bnx2x_set_settings(struct net_device *dev, struct ethtool_cmd *cmd) 
			break;



		default:

			DP(NETIF_MSG_LINK, "Unsupported speed %d\n", speed);

			DP(NETIF_MSG_LINK, "Unsupported speed %u\n", speed);

			return -EINVAL;

		}