From 4382a13a24afe6dcef554fffa0ecbcd1f2dff894 Mon Sep 17 00:00:00 2001
From: "John W. Linville" <linville@tuxdriver.com>
Date: Wed, 19 Oct 2005 08:07:34 -0400
Subject: [PATCH] --- yaml --- r: 10349 b: refs/heads/master c:
 b06c093ed2dc968b3c140dafa55fa6c7b72169e5 h: refs/heads/master i:   10347:
 477be421b7cd70304dbc8c72f9c8c79372bf5b83 v: v3

---
 [refs]                       | 2 +-
 trunk/drivers/net/sundance.c | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index b923f5246de9..2518fd23fab5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 74b0247fbd4b6ed1693a420d85cf50267d840ef4
+refs/heads/master: b06c093ed2dc968b3c140dafa55fa6c7b72169e5
diff --git a/trunk/drivers/net/sundance.c b/trunk/drivers/net/sundance.c
index d8a7e08cab2b..5de0554fd7c6 100644
--- a/trunk/drivers/net/sundance.c
+++ b/trunk/drivers/net/sundance.c
@@ -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--;