summaryrefslogtreecommitdiffstats
path: root/drivers/net/e1000/e1000_hw.c
diff options
context:
space:
mode:
authorJeff Kirsher <jeffrey.t.kirsher@intel.com>2006-01-12 16:50:30 -0800
committerJeff Garzik <jgarzik@pobox.com>2006-01-17 07:40:10 -0500
commitb55ccb356167ed2d2d40b9dc0fe05bbe1a3d6f39 (patch)
tree838628fd9bfbfc60f84f251fddd56edf6906b9a0 /drivers/net/e1000/e1000_hw.c
parent571281972e2ca590ef160dcd6669b9f724b64283 (diff)
downloadop-kernel-dev-b55ccb356167ed2d2d40b9dc0fe05bbe1a3d6f39.zip
op-kernel-dev-b55ccb356167ed2d2d40b9dc0fe05bbe1a3d6f39.tar.gz
[PATCH] e1000: Fix ASF/AMT for 8257{1|2|3} controllers
The 82573 controller required different logic than 82571|2 controllers. Corrected the reset logic for 8257{1|2|3} 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> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
Diffstat (limited to 'drivers/net/e1000/e1000_hw.c')
-rw-r--r--drivers/net/e1000/e1000_hw.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/e1000/e1000_hw.c b/drivers/net/e1000/e1000_hw.c
index 136fc03..f853e10 100644
--- a/drivers/net/e1000/e1000_hw.c
+++ b/drivers/net/e1000/e1000_hw.c
@@ -2982,6 +2982,8 @@ e1000_phy_hw_reset(struct e1000_hw *hw)
if (hw->mac_type < e1000_82571)
msec_delay(10);
+ else
+ udelay(100);
E1000_WRITE_REG(hw, CTRL, ctrl);
E1000_WRITE_FLUSH(hw);
OpenPOWER on IntegriCloud