diff options
| author | Jeff Kirsher <jeffrey.t.kirsher@intel.com> | 2006-01-13 01:50:30 +0100 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2006-01-17 13:40:10 +0100 |
| commit | b55ccb356167ed2d2d40b9dc0fe05bbe1a3d6f39 (patch) | |
| tree | 838628fd9bfbfc60f84f251fddd56edf6906b9a0 /drivers/net/e1000/e1000_hw.c | |
| parent | [PATCH] e1000: Fix SoL/IDER link and loopback (diff) | |
| download | linux-b55ccb356167ed2d2d40b9dc0fe05bbe1a3d6f39.tar.xz linux-b55ccb356167ed2d2d40b9dc0fe05bbe1a3d6f39.zip | |
[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.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/e1000/e1000_hw.c b/drivers/net/e1000/e1000_hw.c index 136fc031e4ad..f853e1064ac0 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); |