diff options
| author | Chris Zankel <chris@zankel.net> | 2009-04-03 05:29:05 -0400 |
|---|---|---|
| committer | Chris Zankel <chris@zankel.net> | 2009-04-03 05:29:05 -0400 |
| commit | 65127d28e312bb6b38ce84a7bb71d762ef63ad4c (patch) | |
| tree | d5fdf52a2d0731f7fab0ce0ed394faac50b04fbc /drivers/net/igb/e1000_phy.c | |
| parent | b8bb76713ec50df2f11efee386e16f93d51e1076 (diff) | |
| parent | 8fe74cf053de7ad2124a894996f84fa890a81093 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into merge
Diffstat (limited to 'drivers/net/igb/e1000_phy.c')
| -rw-r--r-- | drivers/net/igb/e1000_phy.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/net/igb/e1000_phy.c b/drivers/net/igb/e1000_phy.c index de2d48624683..f50fac25be40 100644 --- 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) | |||
| 448 | goto out; | 448 | goto out; |
| 449 | } | 449 | } |
| 450 | 450 | ||
| 451 | /* Wait 15ms for MAC to configure PHY from NVM settings. */ | 451 | /* |
| 452 | msleep(15); | 452 | * Wait 100ms for MAC to configure PHY from NVM settings, to avoid |
| 453 | * timeout issues when LFS is enabled. | ||
| 454 | */ | ||
| 455 | msleep(100); | ||
| 453 | 456 | ||
| 454 | /* | 457 | /* |
| 455 | * The NVM settings will configure LPLU in D3 for | 458 | * The NVM settings will configure LPLU in D3 for |