]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
ibm_emac: fix link speed detection change
authorEugene Surovegin <ebs@ebshome.net>
Wed, 16 May 2007 19:01:05 +0000 (12:01 -0700)
committerJeff Garzik <jeff@garzik.org>
Fri, 18 May 2007 00:43:15 +0000 (20:43 -0400)
Fix link speed detection change.
Thanks to Stefan Roese <sr@denx.de> for finding this bug.

CC: Stefan Roese <sr@denx.de>
Signed-off-by: Eugene Surovegin <ebs@ebshome.net>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
drivers/net/ibm_emac/ibm_emac_core.c

index 50035ebd4f52181326d5c5661c2aa6de57f5ce4f..f752e5fc65ba31d43a7267a5cb721275dbf0e89a 100644 (file)
@@ -926,7 +926,7 @@ static int emac_link_differs(struct ocp_enet_private *dev)
        int duplex = r & EMAC_MR1_FDE ? DUPLEX_FULL : DUPLEX_HALF;
        int speed, pause, asym_pause;
 
-       if (r & (EMAC_MR1_MF_1000 | EMAC_MR1_MF_1000GPCS))
+       if (r & EMAC_MR1_MF_1000)
                speed = SPEED_1000;
        else if (r & EMAC_MR1_MF_100)
                speed = SPEED_100;