summaryrefslogtreecommitdiff
path: root/sys/dev/ic
diff options
context:
space:
mode:
authorBret Lambert <blambert@cvs.openbsd.org>2009-07-29 17:46:32 +0000
committerBret Lambert <blambert@cvs.openbsd.org>2009-07-29 17:46:32 +0000
commit24637f414403ec9666965cb79e370efe9c54a14f (patch)
tree7150c42a0e389d5301e7b8ce337347d8ffbe95c0 /sys/dev/ic
parenta7e7db71db87606f44b8c71a4b8a7d2cb8118c27 (diff)
timeout_add -> timeout_add_msec
ok damien@
Diffstat (limited to 'sys/dev/ic')
-rw-r--r--sys/dev/ic/rt2560.c8
-rw-r--r--sys/dev/ic/rt2661.c8
2 files changed, 8 insertions, 8 deletions
diff --git a/sys/dev/ic/rt2560.c b/sys/dev/ic/rt2560.c
index baf1237d3d3..0b6364c2702 100644
--- a/sys/dev/ic/rt2560.c
+++ b/sys/dev/ic/rt2560.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rt2560.c,v 1.43 2009/03/29 21:53:52 sthen Exp $ */
+/* $OpenBSD: rt2560.c,v 1.44 2009/07/29 17:46:31 blambert Exp $ */
/*-
* Copyright (c) 2005, 2006
@@ -715,7 +715,7 @@ rt2560_amrr_timeout(void *arg)
#endif
splx(s);
- timeout_add(&sc->amrr_to, hz / 2);
+ timeout_add_msec(&sc->amrr_to, 500);
}
void
@@ -758,7 +758,7 @@ rt2560_newstate(struct ieee80211com *ic, enum ieee80211_state nstate, int arg)
case IEEE80211_S_SCAN:
rt2560_set_chan(sc, ic->ic_bss->ni_chan);
- timeout_add(&sc->scan_to, hz / 5);
+ timeout_add_msec(&sc->scan_to, 200);
break;
case IEEE80211_S_AUTH:
@@ -809,7 +809,7 @@ rt2560_newstate(struct ieee80211com *ic, enum ieee80211_state nstate, int arg)
if (ic->ic_opmode != IEEE80211_M_MONITOR) {
/* start automatic rate control timer */
if (ic->ic_fixed_rate == -1)
- timeout_add(&sc->amrr_to, hz / 2);
+ timeout_add_msec(&sc->amrr_to, 500);
rt2560_enable_tsf_sync(sc);
}
diff --git a/sys/dev/ic/rt2661.c b/sys/dev/ic/rt2661.c
index 86efea2c9f9..b4760de947b 100644
--- a/sys/dev/ic/rt2661.c
+++ b/sys/dev/ic/rt2661.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rt2661.c,v 1.48 2009/03/29 21:53:52 sthen Exp $ */
+/* $OpenBSD: rt2661.c,v 1.49 2009/07/29 17:46:31 blambert Exp $ */
/*-
* Copyright (c) 2006
@@ -749,7 +749,7 @@ rt2661_updatestats(void *arg)
rt2661_rx_tune(sc);
splx(s);
- timeout_add(&sc->amrr_to, hz / 2);
+ timeout_add_msec(&sc->amrr_to, 500);
}
void
@@ -790,7 +790,7 @@ rt2661_newstate(struct ieee80211com *ic, enum ieee80211_state nstate, int arg)
case IEEE80211_S_SCAN:
rt2661_set_chan(sc, ic->ic_bss->ni_chan);
- timeout_add(&sc->scan_to, hz / 5);
+ timeout_add_msec(&sc->scan_to, 200);
break;
case IEEE80211_S_AUTH:
@@ -825,7 +825,7 @@ rt2661_newstate(struct ieee80211com *ic, enum ieee80211_state nstate, int arg)
if (ic->ic_opmode != IEEE80211_M_MONITOR) {
sc->ncalls = 0;
sc->avg_rssi = -95; /* reset EMA */
- timeout_add(&sc->amrr_to, hz / 2);
+ timeout_add_msec(&sc->amrr_to, 500);
rt2661_enable_tsf_sync(sc);
}
break;