aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorBrice Goglin <brice@myri.com>2008-05-09 02:17:16 +0200
committerJeff Garzik <jgarzik@redhat.com>2008-05-13 01:30:26 -0400
commitd93ca2a453f8e5734359267866ab4f3341aa8749 (patch)
treee4c1128d1cc860fb2a0a2bd6f0eb51f315d99da5 /drivers/net
parentd1ce3a0f1a07b48e16ebbc71886086779b52f630 (diff)
downloadkernel_samsung_smdk4412-d93ca2a453f8e5734359267866ab4f3341aa8749.zip
kernel_samsung_smdk4412-d93ca2a453f8e5734359267866ab4f3341aa8749.tar.gz
kernel_samsung_smdk4412-d93ca2a453f8e5734359267866ab4f3341aa8749.tar.bz2
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')
-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 162c624..ad6c619 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)
msleep(1);
mb();
i = 0;
- while (mgp->cmd->data != MYRI10GE_NO_CONFIRM_DATA && i < 20) {
- msleep(1);
+ while (mgp->cmd->data != MYRI10GE_NO_CONFIRM_DATA && i < 9) {
+ msleep(1 << i);
i++;
}
if (mgp->cmd->data != MYRI10GE_NO_CONFIRM_DATA) {