From 5b0530e0b73158fd22281c0e1cc9ce28f99a52a7 Mon Sep 17 00:00:00 2001 From: Eugene Surovegin Date: Wed, 16 May 2007 12:01:05 -0700 Subject: [PATCH] --- yaml --- r: 56550 b: refs/heads/master c: dbf2e8585971f2a8b1f60a188dc245fd2f8f81b3 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/ibm_emac/ibm_emac_core.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 79b143174229..141d1b833146 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5bb96e9f2434b49a5b8f135f2a384974aa73db51 +refs/heads/master: dbf2e8585971f2a8b1f60a188dc245fd2f8f81b3 diff --git a/trunk/drivers/net/ibm_emac/ibm_emac_core.c b/trunk/drivers/net/ibm_emac/ibm_emac_core.c index 50035ebd4f52..f752e5fc65ba 100644 --- a/trunk/drivers/net/ibm_emac/ibm_emac_core.c +++ b/trunk/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;