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

Commit 47b9c3b1 authored by Gary Zambrano's avatar Gary Zambrano Committed by Jeff Garzik
Browse files

[PATCH] b44: fix manual speed/duplex/autoneg settings 



Fixes for speed/duplex/autoneg settings and driver settings info.
This is a redo of a previous patch thanks to feedback from Jeff Garzik.

Signed-off-by: default avatarGary Zambrano <zambrano@broadcom.com>
Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent 00e5edcb

drivers/net/b44.c

+28 −16
Original line number Diff line number Diff line
@@ -1620,8 +1620,6 @@ static int b44_get_settings(struct net_device *dev, struct ethtool_cmd *cmd) 
{

	struct b44 *bp = netdev_priv(dev);



	if (!netif_running(dev))

		return -EAGAIN;

	cmd->supported = (SUPPORTED_Autoneg);

	cmd->supported |= (SUPPORTED_100baseT_Half |

			  SUPPORTED_100baseT_Full |
@@ -1649,6 +1647,12 @@ static int b44_get_settings(struct net_device *dev, struct ethtool_cmd *cmd) 
		XCVR_INTERNAL : XCVR_EXTERNAL;

	cmd->autoneg = (bp->flags & B44_FLAG_FORCE_LINK) ?

		AUTONEG_DISABLE : AUTONEG_ENABLE;

	if (cmd->autoneg == AUTONEG_ENABLE)

		cmd->advertising |= ADVERTISED_Autoneg;

	if (!netif_running(dev)){

		cmd->speed = 0;

		cmd->duplex = 0xff;

	}

	cmd->maxtxpkt = 0;

	cmd->maxrxpkt = 0;

	return 0;
@@ -1658,9 +1662,6 @@ static int b44_set_settings(struct net_device *dev, struct ethtool_cmd *cmd) 
{

	struct b44 *bp = netdev_priv(dev);



	if (!netif_running(dev))

		return -EAGAIN;



	/* We do not support gigabit. */

	if (cmd->autoneg == AUTONEG_ENABLE) {

		if (cmd->advertising &
@@ -1677,27 +1678,38 @@ static int b44_set_settings(struct net_device *dev, struct ethtool_cmd *cmd) 
	spin_lock_irq(&bp->lock);



	if (cmd->autoneg == AUTONEG_ENABLE) {

		bp->flags &= ~B44_FLAG_FORCE_LINK;

		bp->flags &= ~(B44_FLAG_ADV_10HALF |

		bp->flags &= ~(B44_FLAG_FORCE_LINK |

			       B44_FLAG_100_BASE_T |

			       B44_FLAG_FULL_DUPLEX |

			       B44_FLAG_ADV_10HALF |

			       B44_FLAG_ADV_10FULL |

			       B44_FLAG_ADV_100HALF |

			       B44_FLAG_ADV_100FULL);

		if (cmd->advertising & ADVERTISE_10HALF)

		if (cmd->advertising == 0) {

			bp->flags |= (B44_FLAG_ADV_10HALF |

				      B44_FLAG_ADV_10FULL |

				      B44_FLAG_ADV_100HALF |

				      B44_FLAG_ADV_100FULL);

		} else {

			if (cmd->advertising & ADVERTISED_10baseT_Half)

				bp->flags |= B44_FLAG_ADV_10HALF;

		if (cmd->advertising & ADVERTISE_10FULL)

			if (cmd->advertising & ADVERTISED_10baseT_Full)

				bp->flags |= B44_FLAG_ADV_10FULL;

		if (cmd->advertising & ADVERTISE_100HALF)

			if (cmd->advertising & ADVERTISED_100baseT_Half)

				bp->flags |= B44_FLAG_ADV_100HALF;

		if (cmd->advertising & ADVERTISE_100FULL)

			if (cmd->advertising & ADVERTISED_100baseT_Full)

				bp->flags |= B44_FLAG_ADV_100FULL;

		}

	} else {

		bp->flags |= B44_FLAG_FORCE_LINK;

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

		if (cmd->speed == SPEED_100)

			bp->flags |= B44_FLAG_100_BASE_T;

		if (cmd->duplex == DUPLEX_FULL)

			bp->flags |= B44_FLAG_FULL_DUPLEX;

	}



	if (netif_running(dev))

		b44_setup_phy(bp);



	spin_unlock_irq(&bp->lock);