diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2010-02-20 11:55:25 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-02-23 00:45:48 +0100 |
| commit | 8850dce170b460d9e46a827a62d6d7bb7e7cfcf3 (patch) | |
| tree | b6fc1c00dce469edc1c21fa86d20f6851270a073 /drivers/net/b44.c | |
| parent | pci: add support for 82576NS serdes to existing SR-IOV quirk (diff) | |
| download | linux-8850dce170b460d9e46a827a62d6d7bb7e7cfcf3.tar.xz linux-8850dce170b460d9e46a827a62d6d7bb7e7cfcf3.zip | |
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>
Diffstat (limited to 'drivers/net/b44.c')
| -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) } } - return 0; + return err; } 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, */ b44_chip_reset(bp, B44_CHIP_RESET_FULL); + /* do a phy reset to test if there is an active phy */ + if (b44_phy_reset(bp) < 0) + bp->phy_addr = B44_PHY_ADDR_NO_PHY; + netdev_info(dev, "Broadcom 44xx/47xx 10/100BaseT Ethernet %pM\n", dev->dev_addr); |