diff options
| author | Marc Balmer <mbalmer@cvs.openbsd.org> | 2007-11-23 15:43:03 +0000 |
|---|---|---|
| committer | Marc Balmer <mbalmer@cvs.openbsd.org> | 2007-11-23 15:43:03 +0000 |
| commit | c1c4b626b699581b962cfad225cc35995f811251 (patch) | |
| tree | 182988f9093b3f2c927fe6cf9d2d23199a20de4a /sys/dev/usb/if_url.c | |
| parent | fc18ac9085d0963e9ca450f94e6bf954e9f30ef9 (diff) | |
Sanitize the use of timeouts:
Instead of calling timeout_set(..., NULL, NULL) in attach routines and
later
timeout_del(...)
timeout_set(..., func, arg)
timeout_add(..., time)
set the function and argument in the initial timeout_set() call and only
use timeout_add(..., time) later.
ok dlg, fgsch, krw, winiger
Diffstat (limited to 'sys/dev/usb/if_url.c')
| -rw-r--r-- | sys/dev/usb/if_url.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/sys/dev/usb/if_url.c b/sys/dev/usb/if_url.c index 6c45ad8e1f3..dff0568c6c4 100644 --- a/sys/dev/usb/if_url.c +++ b/sys/dev/usb/if_url.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_url.c,v 1.49 2007/10/11 18:33:14 deraadt Exp $ */ +/* $OpenBSD: if_url.c,v 1.50 2007/11/23 15:43:02 mbalmer Exp $ */ /* $NetBSD: if_url.c,v 1.6 2002/09/29 10:19:21 martin Exp $ */ /* * Copyright (c) 2001, 2002 @@ -310,7 +310,7 @@ url_attach(struct device *parent, struct device *self, void *aux) if_attach(ifp); ether_ifattach(ifp); - timeout_set(&sc->sc_stat_ch, NULL, NULL); + timeout_set(&sc->sc_stat_ch, url_tick, sc); sc->sc_attached = 1; splx(s); @@ -574,8 +574,6 @@ url_init(struct ifnet *ifp) splx(s); - timeout_del(&sc->sc_stat_ch); - timeout_set(&sc->sc_stat_ch, url_tick, sc); timeout_add(&sc->sc_stat_ch, hz); return (0); @@ -1383,8 +1381,6 @@ url_tick_task(void *xsc) url_start(ifp); } - timeout_del(&sc->sc_stat_ch); - timeout_set(&sc->sc_stat_ch, url_tick, sc); timeout_add(&sc->sc_stat_ch, hz); splx(s); |