Commit 263cd274 authored by Daniel Ritz's avatar Daniel Ritz Committed by Jeff Garzik

[PATCH] net/pcmcia fix fast_poll timers (HZ > 100)

i think we want fast_poll to behave the same with HZ=100 and HZ=1000
parent ea171491
...@@ -1048,7 +1048,7 @@ static void media_check(unsigned long arg) ...@@ -1048,7 +1048,7 @@ static void media_check(unsigned long arg)
} }
if (lp->fast_poll) { if (lp->fast_poll) {
lp->fast_poll--; lp->fast_poll--;
lp->media.expires = jiffies + 2; lp->media.expires = jiffies + 2*HZ/100;
add_timer(&lp->media); add_timer(&lp->media);
return; return;
} }
......
...@@ -921,7 +921,7 @@ static void media_check(unsigned long arg) ...@@ -921,7 +921,7 @@ static void media_check(unsigned long arg)
} }
if (lp->fast_poll) { if (lp->fast_poll) {
lp->fast_poll--; lp->fast_poll--;
lp->media.expires = jiffies + 1; lp->media.expires = jiffies + HZ/100;
add_timer(&lp->media); add_timer(&lp->media);
return; return;
} }
......
...@@ -1996,7 +1996,7 @@ static void media_check(u_long arg) ...@@ -1996,7 +1996,7 @@ static void media_check(u_long arg)
} }
if (smc->fast_poll) { if (smc->fast_poll) {
smc->fast_poll--; smc->fast_poll--;
smc->media.expires = jiffies + 1; smc->media.expires = jiffies + HZ/100;
add_timer(&smc->media); add_timer(&smc->media);
SMC_SELECT_BANK(saved_bank); SMC_SELECT_BANK(saved_bank);
return; return;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment