From: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
Date: Thu, 21 Feb 2008 13:50:54 +0000 (+0900)
Subject: macb: Fix speed setting
X-Git-Tag: v2.6.25-rc4~148^2~41^2~7
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=179956f498bd8cc55fb803c4ee0cf18be59c8b01;p=linux-2.6

macb: Fix speed setting

Fix NCFGR.SPD setting on 10Mbps.  This bug was introduced by
conversion to generic PHY layer in kernel 2.6.23.

Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
---

diff --git a/drivers/net/macb.c b/drivers/net/macb.c
index 81bf005ff2..1d210ed461 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);