Date: Sun, 29 Jun 2008 06:03:33 GMT From: John Birrell <jb@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 144259 for review Message-ID: <200806290603.m5T63XoZ088224@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=144259 Change 144259 by jb@freebsd3 on 2008/06/29 06:02:47 IFC Affected files ... .. //depot/projects/dtrace/src/sys/netinet6/in6_rmx.c#10 integrate Differences ... ==== //depot/projects/dtrace/src/sys/netinet6/in6_rmx.c#10 (text+ko) ==== @@ -73,7 +73,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/netinet6/in6_rmx.c,v 1.22 2008/06/29 00:17:45 julian Exp $"); +__FBSDID("$FreeBSD: src/sys/netinet6/in6_rmx.c,v 1.23 2008/06/29 04:33:45 kan Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -321,8 +321,8 @@ } #define RTQ_TIMEOUT 60*10 /* run no less than once every ten minutes */ -static int rtq_timeoutt = RTQ_TIMEOUT; -static struct callout rtq-timer6; +static int rtq_timeout6 = RTQ_TIMEOUT; +static struct callout rtq_timer6; static void in6_rtqtimo(void *rock) @@ -370,7 +370,7 @@ atv.tv_usec = 0; atv.tv_sec = arg.nextstop - time_uptime; - callout_reset(&rtq-timer6, tvtohz(&atv), in6_rtqtimo, rock); + callout_reset(&rtq_timer6, tvtohz(&atv), in6_rtqtimo, rock); } /* @@ -469,7 +469,7 @@ rnh->rnh_addaddr = in6_addroute; rnh->rnh_matchaddr = in6_matroute; rnh->rnh_close = in6_clsroute; - callout_init(&rtq-timer6, CALLOUT_MPSAFE); + callout_init(&rtq_timer6, CALLOUT_MPSAFE); in6_rtqtimo(rnh); /* kick off timeout first time */ callout_init(&rtq_mtutimer, CALLOUT_MPSAFE); in6_mtutimo(rnh); /* kick off timeout first time */
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200806290603.m5T63XoZ088224>