diff options
author | Malli Chilakala <mallikarjuna.chilakala@intel.com> | 2005-04-28 22:39:53 -0400 |
---|---|---|
committer | Jeff Garzik <jgarzik@pobox.com> | 2005-05-12 20:48:53 -0400 |
commit | 4e48a2b91d408357cb0747151d8db5368ac8f1d0 (patch) | |
tree | 600d1e3fdec1ef85d08eb7bf286a015ac308f09b /drivers/net/e1000 | |
parent | 5de556249fde97493a4c79dbf8979ace0f76789f (diff) |
[PATCH] e1000: Fix kernel panic with 82541 LOM
Fix kernel panic with 82541 LOM when using a 100M cable
Signed-off-by: Mallikarjuna R Chilakala <mallikarjuna.chilakala@intel.com>
Signed-off-by: Ganesh Venkatesan <ganesh.venkatesan@intel.com>
Signed-off-by: John Ronciak <john.ronciak@intel.com>
diff -up net-drivers-2.6/drivers/net/e1000/e1000_main.c net-drivers-2.6/drivers/net/e1000.new/e1000_main.c
Diffstat (limited to 'drivers/net/e1000')
-rw-r--r-- | drivers/net/e1000/e1000_main.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c index 9927106b76c7..9c6c1fbbc412 100644 --- a/drivers/net/e1000/e1000_main.c +++ b/drivers/net/e1000/e1000_main.c | |||
@@ -372,6 +372,7 @@ e1000_down(struct e1000_adapter *adapter) | |||
372 | e1000_read_phy_reg(&adapter->hw, PHY_CTRL, &mii_reg); | 372 | e1000_read_phy_reg(&adapter->hw, PHY_CTRL, &mii_reg); |
373 | mii_reg |= MII_CR_POWER_DOWN; | 373 | mii_reg |= MII_CR_POWER_DOWN; |
374 | e1000_write_phy_reg(&adapter->hw, PHY_CTRL, mii_reg); | 374 | e1000_write_phy_reg(&adapter->hw, PHY_CTRL, mii_reg); |
375 | mdelay(1); | ||
375 | } | 376 | } |
376 | } | 377 | } |
377 | 378 | ||