aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMallikarjuna R Chilakala <mallikarjuna.chilakala@intel.com>2005-10-04 07:07:24 -0400
committerJeff Garzik <jgarzik@pobox.com>2005-10-04 07:07:24 -0400
commit352c9f854cb197581d7135d1276742fd76b53c25 (patch)
tree938d630ff6ef3de60fcb6111bbe253a832ca019f
parente4c811c9d2f2728ce15440c99b3b44b72799b43f (diff)
downloadkernel_samsung_tuna-352c9f854cb197581d7135d1276742fd76b53c25.zip
kernel_samsung_tuna-352c9f854cb197581d7135d1276742fd76b53c25.tar.gz
kernel_samsung_tuna-352c9f854cb197581d7135d1276742fd76b53c25.tar.bz2
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>
-rw-r--r--drivers/net/e1000/e1000_ethtool.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/e1000/e1000_ethtool.c b/drivers/net/e1000/e1000_ethtool.c
index 183b583..ee66947 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