summaryrefslogtreecommitdiffstats
path: root/drivers/net/b44.c
diff options
context:
space:
mode:
authorMatthew Wilcox2005-10-04 19:25:17 +0200
committerJeff Garzik2005-10-28 22:14:10 +0200
commitadf6e00064ebcd3d82009ba6ef66f489f0885ebd (patch)
treed28e9462118fe0702fb717838e094867aae00f7b /drivers/net/b44.c
parent[PATCH] s2io: kconfig help fix (diff)
downloadkernel-qcow2-linux-adf6e00064ebcd3d82009ba6ef66f489f0885ebd.tar.gz
kernel-qcow2-linux-adf6e00064ebcd3d82009ba6ef66f489f0885ebd.tar.xz
kernel-qcow2-linux-adf6e00064ebcd3d82009ba6ef66f489f0885ebd.zip
[PATCH] b44 reports wrong advertised flags
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>
Diffstat (limited to 'drivers/net/b44.c')
-rw-r--r--drivers/net/b44.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/net/b44.c b/drivers/net/b44.c
index 282ebd15f011..225d14fd9239 100644
--- a/drivers/net/b44.c
+++ b/drivers/net/b44.c
@@ -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) ?