From 5d05615a18c0ca60a0346db86176b59c18edf6d9 Mon Sep 17 00:00:00 2001
From: Stefan Assmann <sassmann@kpanic.de>
Date: Tue, 7 Aug 2012 00:45:57 -0700
Subject: [PATCH] --- yaml --- r: 321566 b: refs/heads/master c:
 119b0e0351bcdb7833f368781e6241ff283b49e5 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 165c7df71c6d..7c23e1a79cc6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: eca90f550494171f54f8a700caee65ec16455a5b
+refs/heads/master: 119b0e0351bcdb7833f368781e6241ff283b49e5
diff --git a/trunk/drivers/net/ethernet/intel/igb/igb_ethtool.c b/trunk/drivers/net/ethernet/intel/igb/igb_ethtool.c
index 90550f5e3dd9..70591117051b 100644
--- a/trunk/drivers/net/ethernet/intel/igb/igb_ethtool.c
+++ b/trunk/drivers/net/ethernet/intel/igb/igb_ethtool.c
@@ -1498,6 +1498,9 @@ static int igb_integrated_phy_loopback(struct igb_adapter *adapter)
 		break;
 	}
 
+	/* add small delay to avoid loopback test failure */
+	msleep(50);
+
 	/* force 1000, set loopback */
 	igb_write_phy_reg(hw, PHY_CONTROL, 0x4140);