diff --git a/[refs] b/[refs] index 3c6b856db97a..aeb87712a61e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e4c811c9d2f2728ce15440c99b3b44b72799b43f +refs/heads/master: 352c9f854cb197581d7135d1276742fd76b53c25 diff --git a/trunk/drivers/net/e1000/e1000_ethtool.c b/trunk/drivers/net/e1000/e1000_ethtool.c index 183b583df1d7..ee66947e5043 100644 --- a/trunk/drivers/net/e1000/e1000_ethtool.c +++ b/trunk/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