Page MenuHomeFreeBSD
Files F142432742

D17758.id50468.diff
No OneTemporary
Actions

D17758.id50468.diff
View Options

Index: head/sys/net/altq/altq_cbq.h
===================================================================
--- head/sys/net/altq/altq_cbq.h
+++ head/sys/net/altq/altq_cbq.h
@@ -46,7 +46,7 @@
#define NULL_CLASS_HANDLE 0
-/* class flags should be same as class flags in rm_class.h */
+/* class flags must be same as class flags in altq_rmclass.h */
#define CBQCLF_RED 0x0001 /* use RED */
#define CBQCLF_ECN 0x0002 /* use RED/ECN */
#define CBQCLF_RIO 0x0004 /* use RIO */
@@ -54,6 +54,15 @@
#define CBQCLF_CLEARDSCP 0x0010 /* clear diffserv codepoint */
#define CBQCLF_BORROW 0x0020 /* borrow from parent */
#define CBQCLF_CODEL 0x0040 /* use CoDel */
+
+#ifdef _KERNEL
+CTASSERT(CBQCLF_RED == RMCF_RED);
+CTASSERT(CBQCLF_ECN == RMCF_ECN);
+CTASSERT(CBQCLF_RIO == RMCF_RIO);
+CTASSERT(CBQCLF_FLOWVALVE == RMCF_FLOWVALVE);
+CTASSERT(CBQCLF_CLEARDSCP == RMCF_CLEARDSCP);
+CTASSERT(CBQCLF_CODEL == RMCF_CODEL);
+#endif
/* class flags only for root class */
#define CBQCLF_WRR 0x0100 /* weighted-round robin */
Index: head/sys/net/altq/altq_rmclass.h
===================================================================
--- head/sys/net/altq/altq_rmclass.h
+++ head/sys/net/altq/altq_rmclass.h
@@ -233,13 +233,13 @@
};
/* flags for rmc_init and rmc_newclass */
-/* class flags */
+/* class flags; must be the same as class flags in altq_cbq.h */
#define RMCF_RED 0x0001
#define RMCF_ECN 0x0002
#define RMCF_RIO 0x0004
#define RMCF_FLOWVALVE 0x0008 /* use flowvalve (aka penalty-box) */
#define RMCF_CLEARDSCP 0x0010 /* clear diffserv codepoint */
-#define RMCF_CODEL 0x0020
+#define RMCF_CODEL 0x0040
/* flags for rmc_init */
#define RMCF_WRR 0x0100

File Metadata

Mime Type
text/plain
Expires
Tue, Jan 20, 10:18 PM (16 h, 37 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
27759582
Default Alt Text
D17758.id50468.diff (1 KB)

Event Timeline