diff options
| author | John Scherzer <John.Scherzer@bluto.localdomain> | 2008-05-23 09:54:20 -0400 |
|---|---|---|
| committer | John Scherzer <John.Scherzer@bluto.localdomain> | 2008-05-23 09:54:20 -0400 |
| commit | 5d2f0b59189b27e62d96af2620bcfc8baa4328e7 (patch) | |
| tree | 2b7972ae3ced1a59533b99c4fb0d428221b3cfb2 | |
| parent | 18cd84a7003f7a589b70ed55e0184a890a5ab75f (diff) | |
Uses the correct mask for determining the phy address of the fec lan8700 chip
| -rw-r--r-- | drivers/net/fec.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/net/fec.c b/drivers/net/fec.c index 99890ab5375d..814e77bed0ae 100644 --- a/drivers/net/fec.c +++ b/drivers/net/fec.c @@ -2618,7 +2618,7 @@ mii_discover_phy3(uint mii_reg, struct net_device *dev) if (phy_info[i]) printk(" -- %s\n", phy_info[i]->name); - else + else printk(" -- unknown PHY!\n"); fep->phy = phy_info[i]; @@ -2639,11 +2639,13 @@ mii_discover_phy(uint mii_reg, struct net_device *dev) fecp = fep->hwp; if (fep->phy_addr < 32) { - if ((phytype = (mii_reg & 0xffff)) != 0x7fff && phytype != 0) { + if ((phytype = (mii_reg & 0x3fff)) != 0x3fff && phytype != 0) { /* Got first part of ID, now get remainder. */ fep->phy_id = phytype << 16; + printk("phy_addr=%04x, phy_id=0x%08x\n",fep->phy_addr, + fep->phy_id); mii_queue(dev, mk_mii_read(MII_REG_PHYIR2), mii_discover_phy3); } else { |