Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b06c093e authored by John W. Linville's avatar John W. Linville Committed by Jeff Garzik
Browse files

[PATCH] sundance: include MII address 0 in PHY probe



Include MII address 0 at the end of the PHY scan.  This covers the
entire range of possible MII addresses.

Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
Signed-off-by: default avatarJeff Garzik <jgarzik@pobox.com>
parent 74b0247f
Loading
Loading
Loading
Loading
+5 −4
Original line number Diff line number Diff line
@@ -609,16 +609,17 @@ static int __devinit sundance_probe1 (struct pci_dev *pdev,

	np->phys[0] = 1;		/* Default setting */
	np->mii_preamble_required++;
	for (phy = 1; phy < 32 && phy_idx < MII_CNT; phy++) {
	for (phy = 1; phy <= 32 && phy_idx < MII_CNT; phy++) {
		int mii_status = mdio_read(dev, phy, MII_BMSR);
		int phyx = phy & 0x1f;
		if (mii_status != 0xffff  &&  mii_status != 0x0000) {
			np->phys[phy_idx++] = phy;
			np->mii_if.advertising = mdio_read(dev, phy, MII_ADVERTISE);
			np->phys[phy_idx++] = phyx;
			np->mii_if.advertising = mdio_read(dev, phyx, MII_ADVERTISE);
			if ((mii_status & 0x0040) == 0)
				np->mii_preamble_required++;
			printk(KERN_INFO "%s: MII PHY found at address %d, status "
				   "0x%4.4x advertising %4.4x.\n",
				   dev->name, phy, mii_status, np->mii_if.advertising);
				   dev->name, phyx, mii_status, np->mii_if.advertising);
		}
	}
	np->mii_preamble_required--;