summaryrefslogtreecommitdiffstats
path: root/drivers/net/bnx2.c
diff options
context:
space:
mode:
authorMichael Chan <mchan@broadcom.com>2008-01-30 06:33:03 +0100
committerDavid S. Miller <davem@davemloft.net>2008-02-01 04:27:12 +0100
commitf3014c0cb60ec15a0a2542cbfae7e8d888aa5cf8 (patch)
tree9b57e7a8c0efdbdaccd9ee1800d3e924ebebbd70 /drivers/net/bnx2.c
parent[BLUETOOTH]: Add conn add/del workqueues to avoid connection fail. (diff)
downloadlinux-f3014c0cb60ec15a0a2542cbfae7e8d888aa5cf8.tar.xz
linux-f3014c0cb60ec15a0a2542cbfae7e8d888aa5cf8.zip
[BNX2]: Fix 5706 serdes link down bug.
1. Correct the MII expansion serdes control register definition. 2. Check an additional RUDI_INVALID bit when determining 5706S link. Signed-off-by: Michael Chan <mchan@broadcom.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/bnx2.c')
-rw-r--r--drivers/net/bnx2.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/bnx2.c b/drivers/net/bnx2.c
index 34aebc6e7589..353c73fa3433 100644
--- a/drivers/net/bnx2.c
+++ b/drivers/net/bnx2.c
@@ -5315,7 +5315,7 @@ bnx2_5706_serdes_has_link(struct bnx2 *bp)
bnx2_read_phy(bp, MII_BNX2_MISC_SHADOW, &an_dbg);
bnx2_read_phy(bp, MII_BNX2_MISC_SHADOW, &an_dbg);
- if (an_dbg & MISC_SHDW_AN_DBG_NOSYNC)
+ if (an_dbg & (MISC_SHDW_AN_DBG_NOSYNC | MISC_SHDW_AN_DBG_RUDI_INVALID))
return 0;
bnx2_write_phy(bp, MII_BNX2_DSP_ADDRESS, MII_EXPAND_REG1);