From 2c4d1e60471978714c03cbf03a414992b327519b Mon Sep 17 00:00:00 2001
From: Bruce Allan <bruce.w.allan@intel.com>
Date: Wed, 2 Dec 2009 17:02:43 +0000
Subject: [PATCH] --- yaml --- r: 172091 b: refs/heads/master c:
 5eb6f3c70fcc0fb19b9087863e6e29f96a76f3bd h: refs/heads/master i:   172089:
 e3906b7259810949e24ac5c964443421597a0b05   172087:
 012ad5b1a20130d79d24170eb91d74997362cee4 v: v3

---
 [refs]                         |  2 +-
 trunk/drivers/net/e1000e/hw.h  |  2 +-
 trunk/drivers/net/e1000e/phy.c | 26 ++++++++++++++++----------
 3 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/[refs] b/[refs]
index dd1f6615b2e7..52b117149a0f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 94e5b651595a8eb77665787f7559a6a7c916c195
+refs/heads/master: 5eb6f3c70fcc0fb19b9087863e6e29f96a76f3bd
diff --git a/trunk/drivers/net/e1000e/hw.h b/trunk/drivers/net/e1000e/hw.h
index 41609d5561ba..a7d08dae79c4 100644
--- a/trunk/drivers/net/e1000e/hw.h
+++ b/trunk/drivers/net/e1000e/hw.h
@@ -219,7 +219,7 @@ enum e1e_registers {
 	E1000_HICR      = 0x08F00, /* Host Interface Control */
 };
 
-/* RSS registers */
+#define E1000_MAX_PHY_ADDR		4
 
 /* IGP01E1000 Specific Registers */
 #define IGP01E1000_PHY_PORT_CONFIG	0x10 /* Port Config */
diff --git a/trunk/drivers/net/e1000e/phy.c b/trunk/drivers/net/e1000e/phy.c
index 0c69649af069..67a718862e70 100644
--- a/trunk/drivers/net/e1000e/phy.c
+++ b/trunk/drivers/net/e1000e/phy.c
@@ -2197,28 +2197,34 @@ enum e1000_phy_type e1000e_get_phy_type_from_id(u32 phy_id)
 s32 e1000e_determine_phy_address(struct e1000_hw *hw)
 {
 	s32 ret_val = -E1000_ERR_PHY_TYPE;
-	u32 phy_addr= 0;
-	u32 i = 0;
+	u32 phy_addr = 0;
+	u32 i;
 	enum e1000_phy_type phy_type = e1000_phy_unknown;
 
-	do {
-		for (phy_addr = 0; phy_addr < 4; phy_addr++) {
-			hw->phy.addr = phy_addr;
+	hw->phy.id = phy_type;
+
+	for (phy_addr = 0; phy_addr < E1000_MAX_PHY_ADDR; phy_addr++) {
+		hw->phy.addr = phy_addr;
+		i = 0;
+
+		do {
 			e1000e_get_phy_id(hw);
 			phy_type = e1000e_get_phy_type_from_id(hw->phy.id);
 
-			/* 
+			/*
 			 * If phy_type is valid, break - we found our
 			 * PHY address
 			 */
 			if (phy_type  != e1000_phy_unknown) {
 				ret_val = 0;
-				break;
+				goto out;
 			}
-		}
-		i++;
-	} while ((ret_val != 0) && (i < 100));
+			msleep(1);
+			i++;
+		} while (i < 10);
+	}
 
+out:
 	return ret_val;
 }