diff options
| author | Bill Paul <wpaul@FreeBSD.org> | 2003-12-25 21:34:16 +0000 |
|---|---|---|
| committer | Bill Paul <wpaul@FreeBSD.org> | 2003-12-25 21:34:16 +0000 |
| commit | 8cb4c5760a4b41b7be939e945046dcd2c63b2df2 (patch) | |
| tree | 9e174ca4e621ed3212240b62693ea22bcf576c70 /sys/compat/ndis/kern_ndis.c | |
| parent | 608346656fb2811992f47d2f8a855973bf7ab553 (diff) | |
| download | src-8cb4c5760a4b41b7be939e945046dcd2c63b2df2.tar.gz src-8cb4c5760a4b41b7be939e945046dcd2c63b2df2.zip | |
Give the timer API one last overhaul: this time, use the new callout
API instead of the old timeout/untimeout mechanism.
Notes
Notes:
svn path=/head/; revision=123832
Diffstat (limited to 'sys/compat/ndis/kern_ndis.c')
| -rw-r--r-- | sys/compat/ndis/kern_ndis.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/sys/compat/ndis/kern_ndis.c b/sys/compat/ndis/kern_ndis.c index 3186d8b7d234..76a49d70e6ba 100644 --- a/sys/compat/ndis/kern_ndis.c +++ b/sys/compat/ndis/kern_ndis.c @@ -753,7 +753,6 @@ ndis_halt_nic(arg) __stdcall ndis_halt_handler haltfunc; struct ifnet *ifp; struct ndis_timer_entry *ne; - struct callout_handle *ch; sc = arg; ifp = &sc->arpcom.ac_if; @@ -781,9 +780,7 @@ ndis_halt_nic(arg) while (!TAILQ_EMPTY(&sc->ndis_block.nmb_timerlist)) { ne = TAILQ_FIRST(&sc->ndis_block.nmb_timerlist); TAILQ_REMOVE(&sc->ndis_block.nmb_timerlist, ne, link); - ch = &ne->nte_ch; - if (ch->callout != NULL) - untimeout(ch->callout->c_func, ch->callout->c_arg, *ch); + callout_stop(&ne->nte_ch); free(ne, M_DEVBUF); } |