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

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

ethtool: Use full 32 bit speed range in ethtool's set_settings 



This makes sure the ethtool's set_settings() callback of network
drivers don't ignore the 16 most significant bits when ethtool calls
their set_settings().

All drivers compiled with make allyesconfig on x86_64 have been
updated.

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

drivers/net/acenic.c

+1 −1
Original line number Diff line number Diff line
@@ -2718,7 +2718,7 @@ static int ace_set_settings(struct net_device *dev, struct ethtool_cmd *ecmd) 
		link |= LNK_TX_FLOW_CTL_Y;

	if (ecmd->autoneg == AUTONEG_ENABLE)

		link |= LNK_NEGOTIATE;

	if (ecmd->speed != speed) {

	if (ethtool_cmd_speed(ecmd) != speed) {

		link &= ~(LNK_1000MB | LNK_100MB | LNK_10MB);

		switch (speed) {

		case SPEED_1000:

drivers/net/atl1c/atl1c_ethtool.c

+3 −2
Original line number Diff line number Diff line
@@ -77,7 +77,8 @@ static int atl1c_set_settings(struct net_device *netdev, 
	if (ecmd->autoneg == AUTONEG_ENABLE) {

		autoneg_advertised = ADVERTISED_Autoneg;

	} else {

		if (ecmd->speed == SPEED_1000) {

		u32 speed = ethtool_cmd_speed(ecmd);

		if (speed == SPEED_1000) {

			if (ecmd->duplex != DUPLEX_FULL) {

				if (netif_msg_link(adapter))

					dev_warn(&adapter->pdev->dev,
@@ -86,7 +87,7 @@ static int atl1c_set_settings(struct net_device *netdev, 
				return -EINVAL;

			}

			autoneg_advertised = ADVERTISED_1000baseT_Full;

		} else if (ecmd->speed == SPEED_100) {

		} else if (speed == SPEED_100) {

			if (ecmd->duplex == DUPLEX_FULL)

				autoneg_advertised = ADVERTISED_100baseT_Full;

			else

drivers/net/atlx/atl1.c

+3 −2
Original line number Diff line number Diff line
@@ -3268,7 +3268,8 @@ static int atl1_set_settings(struct net_device *netdev, 
	if (ecmd->autoneg == AUTONEG_ENABLE)

		hw->media_type = MEDIA_TYPE_AUTO_SENSOR;

	else {

		if (ecmd->speed == SPEED_1000) {

		u32 speed = ethtool_cmd_speed(ecmd);

		if (speed == SPEED_1000) {

			if (ecmd->duplex != DUPLEX_FULL) {

				if (netif_msg_link(adapter))

					dev_warn(&adapter->pdev->dev,
@@ -3277,7 +3278,7 @@ static int atl1_set_settings(struct net_device *netdev, 
				goto exit_sset;

			}

			hw->media_type = MEDIA_TYPE_1000M_FULL;

		} else if (ecmd->speed == SPEED_100) {

		} else if (speed == SPEED_100) {

			if (ecmd->duplex == DUPLEX_FULL)

				hw->media_type = MEDIA_TYPE_100M_FULL;

			else

drivers/net/b44.c

+4 −3
Original line number Diff line number Diff line
@@ -1831,6 +1831,7 @@ static int b44_get_settings(struct net_device *dev, struct ethtool_cmd *cmd) 
static int b44_set_settings(struct net_device *dev, struct ethtool_cmd *cmd)

{

	struct b44 *bp = netdev_priv(dev);

	u32 speed = ethtool_cmd_speed(cmd);



	/* We do not support gigabit. */

	if (cmd->autoneg == AUTONEG_ENABLE) {
@@ -1838,8 +1839,8 @@ static int b44_set_settings(struct net_device *dev, struct ethtool_cmd *cmd) 
		    (ADVERTISED_1000baseT_Half |

		     ADVERTISED_1000baseT_Full))

			return -EINVAL;

	} else if ((cmd->speed != SPEED_100 &&

		    cmd->speed != SPEED_10) ||

	} else if ((speed != SPEED_100 &&

		    speed != SPEED_10) ||

		   (cmd->duplex != DUPLEX_HALF &&

		    cmd->duplex != DUPLEX_FULL)) {

			return -EINVAL;
@@ -1873,7 +1874,7 @@ static int b44_set_settings(struct net_device *dev, struct ethtool_cmd *cmd) 
	} else {

		bp->flags |= B44_FLAG_FORCE_LINK;

		bp->flags &= ~(B44_FLAG_100_BASE_T | B44_FLAG_FULL_DUPLEX);

		if (cmd->speed == SPEED_100)

		if (speed == SPEED_100)

			bp->flags |= B44_FLAG_100_BASE_T;

		if (cmd->duplex == DUPLEX_FULL)

			bp->flags |= B44_FLAG_FULL_DUPLEX;

drivers/net/bna/bnad_ethtool.c

+2 −1
Original line number Diff line number Diff line
@@ -256,7 +256,8 @@ bnad_set_settings(struct net_device *netdev, struct ethtool_cmd *cmd) 
	/* 10G full duplex setting supported only */

	if (cmd->autoneg == AUTONEG_ENABLE)

		return -EOPNOTSUPP; else {

		if ((cmd->speed == SPEED_10000) && (cmd->duplex == DUPLEX_FULL))

		if ((ethtool_cmd_speed(cmd) == SPEED_10000)

		    && (cmd->duplex == DUPLEX_FULL))

			return 0;

	}