diff options
| author | David S. Miller <davem@davemloft.net> | 2008-02-24 20:57:16 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-02-24 20:57:16 -0500 |
| commit | 323dbaba2cfab170c656f5d68986ff0ced5b421c (patch) | |
| tree | 99d2ef0d64df0036a4a9d2ef054b5bf20dd7fbd5 /drivers/net/macb.c | |
| parent | bfa274e2436fc7ef72ef51c878083647f1cfd429 (diff) | |
| parent | 3bf319a787a881aa6ad8213b98b93b8de2b6f0e0 (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.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/macb.c b/drivers/net/macb.c index 81bf005ff280..1d210ed46130 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) | |||
| 148 | 148 | ||
| 149 | if (phydev->duplex) | 149 | if (phydev->duplex) |
| 150 | reg |= MACB_BIT(FD); | 150 | reg |= MACB_BIT(FD); |
| 151 | if (phydev->speed) | 151 | if (phydev->speed == SPEED_100) |
| 152 | reg |= MACB_BIT(SPD); | 152 | reg |= MACB_BIT(SPD); |
| 153 | 153 | ||
| 154 | macb_writel(bp, NCFGR, reg); | 154 | macb_writel(bp, NCFGR, reg); |