From: Mallikarjuna R Chilakala <mallikarjuna.chilakala@intel.com>
Date: Tue, 4 Oct 2005 11:07:24 +0000 (-0400)
Subject: e1000: Added msleep_interruptible delay
X-Git-Tag: v2.6.16.28-rc1~3480^2~1^2~54
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=352c9f854cb197581d7135d1276742fd76b53c25;p=karo-tx-linux.git

e1000: Added msleep_interruptible delay

added msleep_interruptible delay right before returning from diag_test to allow
the phy to recover from reset

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>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
---

diff --git a/drivers/net/e1000/e1000_ethtool.c b/drivers/net/e1000/e1000_ethtool.c
index 183b583df1d7..ee66947e5043 100644
--- a/drivers/net/e1000/e1000_ethtool.c
+++ b/drivers/net/e1000/e1000_ethtool.c
@@ -1544,6 +1544,7 @@ e1000_diag_test(struct net_device *netdev,
 		data[2] = 0;
 		data[3] = 0;
 	}
+	msleep_interruptible(4 * 1000);
 }
 
 static void