diff options
| author | Luiz Otavio O Souza <luiz@netgate.com> | 2015-11-11 08:21:18 -0600 |
|---|---|---|
| committer | Luiz Otavio O Souza <luiz@netgate.com> | 2015-11-11 08:22:00 -0600 |
| commit | 53be5c5f6ada07c03bef4582a9634e682f026892 (patch) | |
| tree | 2a1f8a160585dcca0d212304dc5823c359782450 /sys/contrib/altq/altq/altq_priq.h | |
| parent | 4119672798028ff673a738690b48575973689004 (diff) | |
| download | FreeBSD-src-53be5c5f6ada07c03bef4582a9634e682f026892.zip FreeBSD-src-53be5c5f6ada07c03bef4582a9634e682f026892.tar.gz | |
Revert "Importing pfSense patch altq_codel.diff"
This reverts commit cf3bb1a7166bec431631defe01c8d4e706a99638.
TAG: CODEL
Diffstat (limited to 'sys/contrib/altq/altq/altq_priq.h')
| -rw-r--r-- | sys/contrib/altq/altq/altq_priq.h | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/sys/contrib/altq/altq/altq_priq.h b/sys/contrib/altq/altq/altq_priq.h index b5b062f..481d31b 100644 --- a/sys/contrib/altq/altq/altq_priq.h +++ b/sys/contrib/altq/altq/altq_priq.h @@ -32,7 +32,6 @@ #include <altq/altq_classq.h> #include <altq/altq_red.h> #include <altq/altq_rio.h> -#include <altq/altq_codel.h> #ifdef __cplusplus extern "C" { @@ -60,7 +59,6 @@ struct priq_add_class { #define PRCF_RED 0x0001 /* use RED */ #define PRCF_ECN 0x0002 /* use RED/ECN */ #define PRCF_RIO 0x0004 /* use RIO */ -#define PRCF_CODEL 0x0008 /* use CODEL */ #define PRCF_CLEARDSCP 0x0010 /* clear diffserv codepoint */ #define PRCF_DEFAULTCLASS 0x1000 /* default class */ @@ -107,7 +105,6 @@ struct priq_classstats { /* red and rio related info */ int qtype; struct redstats red[3]; /* rio has 3 red stats */ - struct codel_stats codel; }; #ifdef ALTQ3_COMPAT @@ -137,10 +134,7 @@ struct priq_class_stats { struct priq_class { u_int32_t cl_handle; /* class handle */ class_queue_t *cl_q; /* class queue structure */ - union { - struct red *cl_red; /* RED state */ - struct codel *cl_codel; /* CoDel state */ - } cl_aqm; + struct red *cl_red; /* RED state */ int cl_pri; /* priority */ int cl_flags; /* class flags */ struct priq_if *cl_pif; /* back pointer to pif */ @@ -151,8 +145,7 @@ struct priq_class { struct pktcntr cl_xmitcnt; /* transmitted packet counter */ struct pktcntr cl_dropcnt; /* dropped packet counter */ }; -#define cl_red cl_aqm.cl_red -#define cl_codel cl_aqm.cl_codel + /* * priq interface state */ |
