diff options
author | Hauke Mehrtens <hauke@hauke-m.de> | 2010-02-20 05:55:25 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-02-22 18:45:48 -0500 |
commit | 8850dce170b460d9e46a827a62d6d7bb7e7cfcf3 (patch) | |
tree | b6fc1c00dce469edc1c21fa86d20f6851270a073 | |
parent | 7a0deb6bcda98c2a764cb87f1441eef920fd3663 (diff) |
b44: Set PHY address to NO_PHY if reset fails.
Do a PHY reset to test if there is an active phy and set the PHY address
to B44_PHY_ADDR_NO_PHY in case of an not active phy. This is needed for
the Linksys WRTSL54GS and Asus WL-500W.
This patch was used in OpenWRT for a long time.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | drivers/net/b44.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/net/b44.c b/drivers/net/b44.c index 180510ed92a5..71fa0bee8d36 100644 --- a/drivers/net/b44.c +++ b/drivers/net/b44.c | |||
@@ -338,7 +338,7 @@ static int b44_phy_reset(struct b44 *bp) | |||
338 | } | 338 | } |
339 | } | 339 | } |
340 | 340 | ||
341 | return 0; | 341 | return err; |
342 | } | 342 | } |
343 | 343 | ||
344 | static void __b44_set_flow_ctrl(struct b44 *bp, u32 pause_flags) | 344 | static void __b44_set_flow_ctrl(struct b44 *bp, u32 pause_flags) |
@@ -2215,6 +2215,10 @@ static int __devinit b44_init_one(struct ssb_device *sdev, | |||
2215 | */ | 2215 | */ |
2216 | b44_chip_reset(bp, B44_CHIP_RESET_FULL); | 2216 | b44_chip_reset(bp, B44_CHIP_RESET_FULL); |
2217 | 2217 | ||
2218 | /* do a phy reset to test if there is an active phy */ | ||
2219 | if (b44_phy_reset(bp) < 0) | ||
2220 | bp->phy_addr = B44_PHY_ADDR_NO_PHY; | ||
2221 | |||
2218 | netdev_info(dev, "Broadcom 44xx/47xx 10/100BaseT Ethernet %pM\n", | 2222 | netdev_info(dev, "Broadcom 44xx/47xx 10/100BaseT Ethernet %pM\n", |
2219 | dev->dev_addr); | 2223 | dev->dev_addr); |
2220 | 2224 | ||