[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: Gary Zambrano <zambrano@broadcom.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>

1 files changed, 28 insertions, 16 deletions

diff --git a/drivers/net/b44.c b/drivers/net/b44.c
index d8233e0b789..41b1618573c 100644
--- a/drivers/net/b44.c
+++ b/drivers/net/b44.c
@@ -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,28 +1678,39 @@ 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)
-                        bp->flags |= B44_FLAG_ADV_10HALF;
-                if (cmd->advertising & ADVERTISE_10FULL)
-                        bp->flags |= B44_FLAG_ADV_10FULL;
-                if (cmd->advertising & ADVERTISE_100HALF)
-                        bp->flags |= B44_FLAG_ADV_100HALF;
-                if (cmd->advertising & ADVERTISE_100FULL)
-                        bp->flags |= B44_FLAG_ADV_100FULL;
+                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 & ADVERTISED_10baseT_Full)
+                                bp->flags |= B44_FLAG_ADV_10FULL;
+                        if (cmd->advertising & ADVERTISED_100baseT_Half)
+                                bp->flags |= B44_FLAG_ADV_100HALF;
+                        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;
         }
 
-        b44_setup_phy(bp);
+        if (netif_running(dev))
+                b44_setup_phy(bp);
 
         spin_unlock_irq(&bp->lock);