D31835.diff
No OneTemporary
Actions

Size

995 B

Referenced Files

None

Subscribers

None

D31835.diff
View Options

	diff --git a/sys/net/altq/altq_subr.c b/sys/net/altq/altq_subr.c
	--- a/sys/net/altq/altq_subr.c
	+++ b/sys/net/altq/altq_subr.c
	@@ -908,9 +908,7 @@
	static void
	init_machclk_setup(void)
	{
	-#if (__FreeBSD_version >= 600000)
	- callout_init(&tbr_callout, 0);
	-#endif
	+ callout_init(&tbr_callout, 1);

	machclk_usepcc = 1;

	diff --git a/sys/net/altq/altq_var.h b/sys/net/altq/altq_var.h
	--- a/sys/net/altq/altq_var.h
	+++ b/sys/net/altq/altq_var.h
	@@ -164,16 +164,9 @@
	/* use callout */
	#include <sys/callout.h>

	-#if (__FreeBSD_version > 500000)
	-#define CALLOUT_INIT(c) callout_init((c), 0)
	-#else
	-#define CALLOUT_INIT(c) callout_init((c))
	-#endif
	+#define CALLOUT_INIT(c) callout_init((c), 1)
	#define CALLOUT_RESET(c,t,f,a) callout_reset((c),(t),(f),(a))
	#define CALLOUT_STOP(c) callout_stop((c))
	-#if !defined(CALLOUT_INITIALIZER) && (__FreeBSD_version < 600000)
	-#define CALLOUT_INITIALIZER { { { NULL } }, 0, NULL, NULL, 0 }
	-#endif

	#define m_pktlen(m) ((m)->m_pkthdr.len)