summaryrefslogtreecommitdiffstats
path: root/drivers/net/macb.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2008-02-24 17:57:16 -0800
committerDavid S. Miller <davem@davemloft.net>2008-02-24 17:57:16 -0800
commit323dbaba2cfab170c656f5d68986ff0ced5b421c (patch)
tree99d2ef0d64df0036a4a9d2ef054b5bf20dd7fbd5 /drivers/net/macb.c
parentbfa274e2436fc7ef72ef51c878083647f1cfd429 (diff)
parent3bf319a787a881aa6ad8213b98b93b8de2b6f0e0 (diff)
Merge branch 'upstream-davem' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
Diffstat (limited to 'drivers/net/macb.c')
-rw-r--r--drivers/net/macb.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/macb.c b/drivers/net/macb.c
index 81bf005ff28..1d210ed4613 100644
--- a/drivers/net/macb.c
+++ b/drivers/net/macb.c
@@ -148,7 +148,7 @@ static void macb_handle_link_change(struct net_device *dev)
if (phydev->duplex)
reg |= MACB_BIT(FD);
- if (phydev->speed)
+ if (phydev->speed == SPEED_100)
reg |= MACB_BIT(SPD);
macb_writel(bp, NCFGR, reg);