diff options
| author | gibbs <gibbs@FreeBSD.org> | 1997-09-21 22:02:25 +0000 |
|---|---|---|
| committer | gibbs <gibbs@FreeBSD.org> | 1997-09-21 22:02:25 +0000 |
| commit | a415512fd4b3c95c87808401c97e649c8ac7f41e (patch) | |
| tree | 8463ee0d001498dfdefc34fc8911c491b2f0ecf0 /sys/netinet/ip_mroute.c | |
| parent | 52ace446d29ab170f74f1db02832f24b01e04f20 (diff) | |
| download | FreeBSD-src-a415512fd4b3c95c87808401c97e649c8ac7f41e.zip FreeBSD-src-a415512fd4b3c95c87808401c97e649c8ac7f41e.tar.gz | |
Update for new callout interface.
Diffstat (limited to 'sys/netinet/ip_mroute.c')
| -rw-r--r-- | sys/netinet/ip_mroute.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/sys/netinet/ip_mroute.c b/sys/netinet/ip_mroute.c index f673abf..5412186 100644 --- a/sys/netinet/ip_mroute.c +++ b/sys/netinet/ip_mroute.c @@ -9,7 +9,7 @@ * Modified by Bill Fenner, PARC, April 1995 * * MROUTING Revision: 3.5 - * $Id: ip_mroute.c,v 1.39 1997/03/24 11:33:28 bde Exp $ + * $Id: ip_mroute.c,v 1.40 1997/07/19 20:07:07 fenner Exp $ */ #include "opt_mrouting.h" @@ -226,6 +226,8 @@ static u_int mrtdebug = 0; /* debug level */ static u_int tbfdebug = 0; /* tbf debug level */ static u_int rsvpdebug = 0; /* rsvp debug level */ +static struct callout_handle expire_upcalls_ch; + #define EXPIRE_TIMEOUT (hz / 4) /* 4x / second */ #define UPCALL_EXPIRE 6 /* number of timeouts */ @@ -540,7 +542,7 @@ ip_mrouter_init(so, m) pim_assert = 0; - timeout(expire_upcalls, (caddr_t)NULL, EXPIRE_TIMEOUT); + expire_upcalls_ch = timeout(expire_upcalls, (caddr_t)NULL, EXPIRE_TIMEOUT); if (mrtdebug) log(LOG_DEBUG, "ip_mrouter_init\n"); @@ -584,7 +586,7 @@ X_ip_mrouter_done() numvifs = 0; pim_assert = 0; - untimeout(expire_upcalls, (caddr_t)NULL); + untimeout(expire_upcalls, (caddr_t)NULL, expire_upcalls_ch); /* * Free all multicast forwarding cache entries. @@ -1376,7 +1378,7 @@ expire_upcalls(void *unused) } } splx(s); - timeout(expire_upcalls, (caddr_t)NULL, EXPIRE_TIMEOUT); + expire_upcalls_ch = timeout(expire_upcalls, (caddr_t)NULL, EXPIRE_TIMEOUT); } /* |
