]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
macb: Fix speed setting
authorAtsushi Nemoto <anemo@mba.ocn.ne.jp>
Mon, 3 Mar 2008 15:51:48 +0000 (16:51 +0100)
committerChris Wright <chrisw@sous-sol.org>
Mon, 24 Mar 2008 18:47:33 +0000 (11:47 -0700)
commit: 179956f498bd8cc55fb803c4ee0cf18be59c8b01

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>
Signed-off-by: Haavard Skinnemoen <hskinnemoen@atmel.com>
Signed-off-by: Chris Wright <chrisw@sous-sol.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
drivers/net/macb.c

index e10528ed90814b626751d5488e5bb26233bed360..c796948051cb666100ef418229aae319b09f3d4f 100644 (file)
@@ -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);