summaryrefslogtreecommitdiffstats
path: root/sys/rpc
diff options
context:
space:
mode:
authorkan <kan@FreeBSD.org>2004-03-07 16:23:03 +0000
committerkan <kan@FreeBSD.org>2004-03-07 16:23:03 +0000
commitedfb020c3046b39eb2841d6799792bc0ca4dfd76 (patch)
treeb1333a807779e8f0f09430757ffa6fd3eef073cd /sys/rpc
parentea1893785c709e15070cd36b800d1bbaa7e46011 (diff)
downloadFreeBSD-src-edfb020c3046b39eb2841d6799792bc0ca4dfd76.zip
FreeBSD-src-edfb020c3046b39eb2841d6799792bc0ca4dfd76.tar.gz
Convert from timeout to callout API.
Diffstat (limited to 'sys/rpc')
-rw-r--r--sys/rpc/rpcclnt.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/sys/rpc/rpcclnt.c b/sys/rpc/rpcclnt.c
index 01de50a..9b0bb05 100644
--- a/sys/rpc/rpcclnt.c
+++ b/sys/rpc/rpcclnt.c
@@ -203,7 +203,7 @@ SYSCTL_UINT(_kern_rpc, OID_AUTO, debug_on, CTLFLAG_RW, &rpcdebugon, 0, "RPC Debu
*/
static
TAILQ_HEAD(, rpctask) rpctask_q;
-struct callout_handle rpcclnt_timer_handle;
+struct callout rpcclnt_callout;
#ifdef __OpenBSD__
static int rpcclnt_send(struct socket *, struct mbuf *, struct mbuf *, struct rpctask *);
@@ -283,8 +283,8 @@ rpcclnt_init(void)
timeout_set(&rpcclnt_timer_to, rpcclnt_timer, &rpcclnt_timer_to);
rpcclnt_timer(&rpcclnt_timer_to);
#else /* !__OpenBSD__ */
+ callout_init(&rpcclnt_callout, 0);
rpcclnt_timer(NULL);
-
#endif /* !__OpenBSD__ */
RPCDEBUG("rpc initialed");
@@ -296,7 +296,7 @@ void
rpcclnt_uninit(void)
{
RPCDEBUG("uninit");
- untimeout(rpcclnt_timer, (void *)NULL, rpcclnt_timer_handle);
+ callout_stop(&rpcclnt_callout);
/* XXX delete sysctl variables? */
}
@@ -1476,7 +1476,7 @@ rpcclnt_timer(arg)
#ifdef __OpenBSD__
timeout_add(rpcclnt_timer, to, rpcclnt_ticks);
#else
- rpcclnt_timer_handle = timeout(rpcclnt_timer, NULL, rpcclnt_ticks);
+ callout_reset(&rpcclnt_callout, rpcclnt_ticks, rpcclnt_timer, NULL);
#endif
}
OpenPOWER on IntegriCloud