Page MenuHomeFreeBSD
Files F150668918

D31835.id94658.diff
No OneTemporary
Actions

D31835.id94658.diff
View Options

Index: sys/net/altq/altq_subr.c
===================================================================
--- sys/net/altq/altq_subr.c
+++ 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;
Index: sys/net/altq/altq_var.h
===================================================================
--- sys/net/altq/altq_var.h
+++ 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)

File Metadata

Mime Type
text/plain
Expires
Sat, Apr 4, 5:49 AM (5 h, 44 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
30761970
Default Alt Text
D31835.id94658.diff (1 KB)

Event Timeline