aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/myri10ge
diff options
context:
space:
mode:
authorBrice Goglin <brice@myri.com>2008-05-08 20:17:16 -0400
committerJeff Garzik <jgarzik@redhat.com>2008-05-13 01:30:26 -0400
commitd93ca2a453f8e5734359267866ab4f3341aa8749 (patch)
treee4c1128d1cc860fb2a0a2bd6f0eb51f315d99da5 /drivers/net/myri10ge
parentd1ce3a0f1a07b48e16ebbc71886086779b52f630 (diff)
myri10ge: increase and fix handoff timeout
Increase the handoff timeout to 512ms so as to give the aeluros based NICs sufficient time to handoff without relying on the msleep() being sloppy, and accidentally sleeping way longer than the 20ms we specified in 20 separate 1ms sleeps. Fix typo in the handoff sleep delay, which made it additive, not exponential. Signed-off-by: Brice Goglin <brice@myri.com> Signed-off-by: Andrew Gallatin <gallatin@myri.com> Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
Diffstat (limited to 'drivers/net/myri10ge')
-rw-r--r--drivers/net/myri10ge/myri10ge.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/myri10ge/myri10ge.c b/drivers/net/myri10ge/myri10ge.c
index 162c624f7f53..ad6c619e3a56 100644
--- a/drivers/net/myri10ge/myri10ge.c
+++ b/drivers/net/myri10ge/myri10ge.c
@@ -682,8 +682,8 @@ static int myri10ge_load_firmware(struct myri10ge_priv *mgp)
682 msleep(1); 682 msleep(1);
683 mb(); 683 mb();
684 i = 0; 684 i = 0;
685 while (mgp->cmd->data != MYRI10GE_NO_CONFIRM_DATA && i < 20) { 685 while (mgp->cmd->data != MYRI10GE_NO_CONFIRM_DATA && i < 9) {
686 msleep(1); 686 msleep(1 << i);
687 i++; 687 i++;
688 } 688 }
689 if (mgp->cmd->data != MYRI10GE_NO_CONFIRM_DATA) { 689 if (mgp->cmd->data != MYRI10GE_NO_CONFIRM_DATA) {