]> err.no Git - linux-2.6/commitdiff
[PATCH] b44 reports wrong advertised flags
authorMatthew Wilcox <matthew@wil.cx>
Tue, 4 Oct 2005 17:25:17 +0000 (11:25 -0600)
committerJeff Garzik <jgarzik@pobox.com>
Fri, 28 Oct 2005 20:14:10 +0000 (16:14 -0400)
Looks like someone used the MII constants instead of the ethtool constants.

Signed-off-by: Matthew Wilcox <matthew@wil.cx>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
drivers/net/b44.c

index 282ebd15f0115ae659b74a7b9e902631fa1640e6..225d14fd9239f07e2ac438810494cde352d63086 100644 (file)
@@ -1619,14 +1619,14 @@ static int b44_get_settings(struct net_device *dev, struct ethtool_cmd *cmd)
 
        cmd->advertising = 0;
        if (bp->flags & B44_FLAG_ADV_10HALF)
-               cmd->advertising |= ADVERTISE_10HALF;
+               cmd->advertising |= ADVERTISED_10baseT_Half;
        if (bp->flags & B44_FLAG_ADV_10FULL)
-               cmd->advertising |= ADVERTISE_10FULL;
+               cmd->advertising |= ADVERTISED_10baseT_Full;
        if (bp->flags & B44_FLAG_ADV_100HALF)
-               cmd->advertising |= ADVERTISE_100HALF;
+               cmd->advertising |= ADVERTISED_100baseT_Half;
        if (bp->flags & B44_FLAG_ADV_100FULL)
-               cmd->advertising |= ADVERTISE_100FULL;
-       cmd->advertising |= ADVERTISE_PAUSE_CAP | ADVERTISE_PAUSE_ASYM;
+               cmd->advertising |= ADVERTISED_100baseT_Full;
+       cmd->advertising |= ADVERTISED_Pause | ADVERTISED_Asym_Pause;
        cmd->speed = (bp->flags & B44_FLAG_100_BASE_T) ?
                SPEED_100 : SPEED_10;
        cmd->duplex = (bp->flags & B44_FLAG_FULL_DUPLEX) ?