diff options
| author | Eugene Surovegin <ebs@ebshome.net> | 2007-05-16 12:01:05 -0700 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2007-05-17 20:43:15 -0400 |
| commit | dbf2e8585971f2a8b1f60a188dc245fd2f8f81b3 (patch) | |
| tree | 185b545417ac662b5a142b055fc84a1d7d77f550 /drivers/net/ibm_emac | |
| parent | 5bb96e9f2434b49a5b8f135f2a384974aa73db51 (diff) | |
| download | talos-op-linux-dbf2e8585971f2a8b1f60a188dc245fd2f8f81b3.tar.gz talos-op-linux-dbf2e8585971f2a8b1f60a188dc245fd2f8f81b3.zip | |
ibm_emac: fix link speed detection change
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>
Diffstat (limited to 'drivers/net/ibm_emac')
| -rw-r--r-- | drivers/net/ibm_emac/ibm_emac_core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ibm_emac/ibm_emac_core.c b/drivers/net/ibm_emac/ibm_emac_core.c index 50035ebd4f52..f752e5fc65ba 100644 --- a/drivers/net/ibm_emac/ibm_emac_core.c +++ b/drivers/net/ibm_emac/ibm_emac_core.c @@ -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; |
