Merge branch 'omap-pool'

[linux-2.6-omap-h63xx.git] / drivers / net / igb / e1000_phy.c

diff --git a/drivers/net/igb/e1000_phy.c b/drivers/net/igb/e1000_phy.c
index de2d48624683d03388039a15aff3bc4b22d9dbc9..f50fac25be403167f147c1867b31f4b4cac8bb31 100644 (file)
--- a/drivers/net/igb/e1000_phy.c
+++ b/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