From: Malli Chilakala <mallikarjuna.chilakala@intel.com>
Date: Fri, 29 Apr 2005 02:39:53 +0000 (-0700)
Subject: [PATCH] e1000: Fix kernel panic with 82541 LOM
X-Git-Tag: v2.6.12-rc6~160^2~3^2~11
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4e48a2b91d408357cb0747151d8db5368ac8f1d0;p=linux-2.6

[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
---

diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c
index 9927106b76..9c6c1fbbc4 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)
 		e1000_read_phy_reg(&adapter->hw, PHY_CTRL, &mii_reg);
 		mii_reg |= MII_CR_POWER_DOWN;
 		e1000_write_phy_reg(&adapter->hw, PHY_CTRL, mii_reg);
+		mdelay(1);
 	}
 }