diff options
| author |   miod <miod@openbsd.org> | 2001-08-19 15:07:30 +0000 |
|---|---|---|
| committer | miod <miod@openbsd.org> | 2001-08-19 15:07:30 +0000 |
| commit | 1337d0918fea1848b33157cf4a99d231bb73dcfe (patch) | |
| tree | 2d32a7b5222f8890becf001523ecaedd2a871534 /sys/netiso/esis.c | |
| parent | I'm a knuckle-dragging moron, the fd_set is overflowable - make it so (diff) | |
| download | wireguard-openbsd-1337d0918fea1848b33157cf4a99d231bb73dcfe.tar.xz wireguard-openbsd-1337d0918fea1848b33157cf4a99d231bb73dcfe.zip | |
More old timeouts removal, mainly affected unused/unmaintained code.
Diffstat (limited to 'sys/netiso/esis.c')
| -rw-r--r-- | sys/netiso/esis.c | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/sys/netiso/esis.c b/sys/netiso/esis.c index 6cf5d0a0409..21a10ff9015 100644 --- a/sys/netiso/esis.c +++ b/sys/netiso/esis.c @@ -1,4 +1,4 @@ -/* $OpenBSD: esis.c,v 1.5 2001/05/16 12:54:06 ho Exp $ */ +/* $OpenBSD: esis.c,v 1.6 2001/08/19 15:07:34 miod Exp $ */ /* $NetBSD: esis.c,v 1.14 1996/05/07 02:45:04 thorpej Exp $ */ /*- @@ -74,6 +74,7 @@ SOFTWARE. #include <sys/socketvar.h> #include <sys/errno.h> #include <sys/kernel.h> +#include <sys/timeout.h> #include <net/if.h> #include <net/if_dl.h> @@ -109,6 +110,9 @@ extern int iso_systype; struct sockaddr_dl esis_dl = {sizeof(esis_dl), AF_LINK}; extern char all_es_snpa[], all_is_snpa[]; +struct timeout snpac_timeout; +struct timeout esis_timeout; + #define EXTEND_PACKET(m, mhdr, cp)\ if (((m)->m_next = m_getclr(M_DONTWAIT, MT_HEADER)) == NULL) {\ esis_stat.es_nomem++;\ @@ -137,8 +141,10 @@ esis_init() LIST_INIT(&esis_pcb); - timeout(snpac_age, (caddr_t) 0, hz); - timeout(esis_config, (caddr_t) 0, hz); + timeout_set(&snpac_timeout, snpac_age, NULL); + timeout_set(&esis_timeout, esis_config, NULL); + timeout_add(&snpac_timeout, hz); + timeout_add(&esis_timeout, hz); clnl_protox[ISO9542_ESIS].clnl_input = esis_input; clnl_protox[ISO10589_ISIS].clnl_input = isis_input; @@ -651,7 +657,7 @@ esis_ishinput(m, shp) goto bad; CTOH(buf[2], buf[3], newct); if ((u_short) esis_config_time != newct) { - untimeout(esis_config, 0); + timeout_del(&esis_timeout); esis_config_time = newct; esis_config(NULL); } @@ -795,7 +801,7 @@ esis_config(v) { register struct ifnet *ifp; - timeout(esis_config, (caddr_t) 0, hz * esis_config_time); + timeout_add(&esis_timeout, hz * esis_config_time); /* * Report configuration for each interface that - is UP - has |