From d7cddc461cd0782ce643ea5b4bd4fabf93a4650b Mon Sep 17 00:00:00 2001
From: Stefan Assmann <sassmann@kpanic.de>
Date: Sat, 2 Feb 2013 08:31:50 +0000
Subject: [PATCH] --- yaml --- r: 352502 b: refs/heads/master c:
 4507dc9f98a4155bcb85735ac6dd4158b2d391b3 h: refs/heads/master v: v3

---
 [refs]                                             | 2 +-
 trunk/drivers/net/ethernet/intel/igb/igb_ethtool.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index e2f09f282e10..c34702c55a5b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3eb1a40f4b6d0c41feb60e55b53d11f70fc8ee8e
+refs/heads/master: 4507dc9f98a4155bcb85735ac6dd4158b2d391b3
diff --git a/trunk/drivers/net/ethernet/intel/igb/igb_ethtool.c b/trunk/drivers/net/ethernet/intel/igb/igb_ethtool.c
index 40b5d568d808..a3830a8ba4c1 100644
--- a/trunk/drivers/net/ethernet/intel/igb/igb_ethtool.c
+++ b/trunk/drivers/net/ethernet/intel/igb/igb_ethtool.c
@@ -1891,7 +1891,7 @@ static int igb_link_test(struct igb_adapter *adapter, u64 *data)
 	} else {
 		hw->mac.ops.check_for_link(&adapter->hw);
 		if (hw->mac.autoneg)
-			msleep(4000);
+			msleep(5000);
 
 		if (!(rd32(E1000_STATUS) & E1000_STATUS_LU))
 			*data = 1;