From 40602672b6da63a898738e71e09d367ac9d10a3f Mon Sep 17 00:00:00 2001 From: Alexander Duyck Date: Tue, 31 Mar 2009 20:38:38 +0000 Subject: [PATCH] --- yaml --- r: 139800 b: refs/heads/master c: a6a605691f666482a261d69da7e0cef7048a434b h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/igb/e1000_phy.c | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 47a1f7348b1e..1c7baded7dba 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d1a8c9e1c8a49afccc85dfeccd731ccbec52e724 +refs/heads/master: a6a605691f666482a261d69da7e0cef7048a434b diff --git a/trunk/drivers/net/igb/e1000_phy.c b/trunk/drivers/net/igb/e1000_phy.c index de2d48624683..f50fac25be40 100644 --- a/trunk/drivers/net/igb/e1000_phy.c +++ b/trunk/drivers/net/igb/e1000_phy.c @@ -448,8 +448,11 @@ s32 igb_copper_link_setup_igp(struct e1000_hw *hw) goto out; } - /* Wait 15ms for MAC to configure PHY from NVM settings. */ - msleep(15); + /* + * Wait 100ms for MAC to configure PHY from NVM settings, to avoid + * timeout issues when LFS is enabled. + */ + msleep(100); /* * The NVM settings will configure LPLU in D3 for