From: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Date: Fri, 3 Mar 2006 02:17:30 +0000 (-0800)
Subject: e1000: Fix unecessary delay for 82573 controllers
X-Git-Tag: v2.6.17-rc1~1186^2~46
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5b66ba0db8d04d99926445bc7d9f920bb5d744ed;p=linux-2.6

e1000: Fix unecessary delay for 82573 controllers


Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
Signed-off-by: John Ronciak <john.ronciak@intel.com>
---

diff --git a/drivers/net/e1000/e1000_hw.c b/drivers/net/e1000/e1000_hw.c
index beeec0fbbe..0af68bab97 100644
--- a/drivers/net/e1000/e1000_hw.c
+++ b/drivers/net/e1000/e1000_hw.c
@@ -6746,12 +6746,6 @@ e1000_get_phy_cfg_done(struct e1000_hw *hw)
         break;
     }
 
-    /* PHY configuration from NVM just starts after EECD_AUTO_RD sets to high.
-     * Need to wait for PHY configuration completion before accessing NVM
-     * and PHY. */
-    if (hw->mac_type == e1000_82573)
-        msec_delay(25);
-
     return E1000_SUCCESS;
 }