diff options
| author | Mike Karels <karels@FreeBSD.org> | 2018-11-16 03:42:29 +0000 |
|---|---|---|
| committer | Mike Karels <karels@FreeBSD.org> | 2018-11-16 03:42:29 +0000 |
| commit | 456e896d6d06fe0a3188c7ecead082c7891d0eb5 (patch) | |
| tree | 5585228f8d0a30dd1583a0a02718530f506a246b /sys/net/altq | |
| parent | f0aefccb70650559ff4b2127d7b637f8230e3d38 (diff) | |
Notes
Diffstat (limited to 'sys/net/altq')
| -rw-r--r-- | sys/net/altq/altq_cbq.h | 11 | ||||
| -rw-r--r-- | sys/net/altq/altq_rmclass.h | 4 |
2 files changed, 12 insertions, 3 deletions
diff --git a/sys/net/altq/altq_cbq.h b/sys/net/altq/altq_cbq.h index 04bcab1af767..64c75fe95a5f 100644 --- a/sys/net/altq/altq_cbq.h +++ b/sys/net/altq/altq_cbq.h @@ -46,7 +46,7 @@ extern "C" { #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 */ @@ -55,6 +55,15 @@ extern "C" { #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 */ #define CBQCLF_EFFICIENT 0x0200 /* work-conserving */ diff --git a/sys/net/altq/altq_rmclass.h b/sys/net/altq/altq_rmclass.h index 268ed63f433e..7e58ec49b943 100644 --- a/sys/net/altq/altq_rmclass.h +++ b/sys/net/altq/altq_rmclass.h @@ -233,13 +233,13 @@ struct rm_ifdat { }; /* 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 |