Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 139800
b: refs/heads/master
c: a6a6056
h: refs/heads/master
v: v3
  • Loading branch information
Alexander Duyck authored and David S. Miller committed Apr 2, 2009
1 parent 15ebf8e commit 4060267
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: d1a8c9e1c8a49afccc85dfeccd731ccbec52e724
refs/heads/master: a6a605691f666482a261d69da7e0cef7048a434b
7 changes: 5 additions & 2 deletions trunk/drivers/net/igb/e1000_phy.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 4060267

Please sign in to comment.