From 53be5c5f6ada07c03bef4582a9634e682f026892 Mon Sep 17 00:00:00 2001 From: Luiz Otavio O Souza Date: Wed, 11 Nov 2015 08:21:18 -0600 Subject: Revert "Importing pfSense patch altq_codel.diff" This reverts commit cf3bb1a7166bec431631defe01c8d4e706a99638. TAG: CODEL --- sys/conf/files | 1 - sys/conf/options | 1 - sys/contrib/altq/altq/altq.h | 3 +- sys/contrib/altq/altq/altq_cbq.c | 4 - sys/contrib/altq/altq/altq_cbq.h | 3 - sys/contrib/altq/altq/altq_classq.h | 6 - sys/contrib/altq/altq/altq_codel.c | 434 ----------------------------------- sys/contrib/altq/altq/altq_codel.h | 87 ------- sys/contrib/altq/altq/altq_fairq.c | 43 +--- sys/contrib/altq/altq/altq_fairq.h | 10 +- sys/contrib/altq/altq/altq_hfsc.c | 35 --- sys/contrib/altq/altq/altq_hfsc.h | 10 +- sys/contrib/altq/altq/altq_priq.c | 39 ---- sys/contrib/altq/altq/altq_priq.h | 11 +- sys/contrib/altq/altq/altq_rmclass.c | 29 +-- sys/contrib/altq/altq/altq_rmclass.h | 9 +- sys/contrib/altq/altq/altq_subr.c | 20 -- sys/contrib/altq/altq/altq_var.h | 5 - sys/netpfil/pf/pf_altq.h | 7 - sys/sys/mbuf.h | 1 - 20 files changed, 11 insertions(+), 747 deletions(-) delete mode 100644 sys/contrib/altq/altq/altq_codel.c delete mode 100644 sys/contrib/altq/altq/altq_codel.h (limited to 'sys') diff --git a/sys/conf/files b/sys/conf/files index 2946aaf..3e6ca83 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -253,7 +253,6 @@ compat/freebsd32/freebsd32_sysent.c optional compat_freebsd32 contrib/altq/altq/altq_cbq.c optional altq contrib/altq/altq/altq_cdnr.c optional altq contrib/altq/altq/altq_hfsc.c optional altq -contrib/altq/altq/altq_codel.c optional altq contrib/altq/altq/altq_fairq.c optional altq contrib/altq/altq/altq_priq.c optional altq contrib/altq/altq/altq_red.c optional altq diff --git a/sys/conf/options b/sys/conf/options index 0edb0db..45aeb51 100644 --- a/sys/conf/options +++ b/sys/conf/options @@ -390,7 +390,6 @@ ALTQ_NOPCC opt_altq.h ALTQ_PRIQ opt_altq.h ALTQ_RED opt_altq.h ALTQ_RIO opt_altq.h -ALTQ_CODEL opt_altq.h BOOTP opt_bootp.h BOOTP_BLOCKSIZE opt_bootp.h BOOTP_COMPAT opt_bootp.h diff --git a/sys/contrib/altq/altq/altq.h b/sys/contrib/altq/altq/altq.h index 26d6cb7..6200ac5 100644 --- a/sys/contrib/altq/altq/altq.h +++ b/sys/contrib/altq/altq/altq.h @@ -64,8 +64,7 @@ #define ALTQT_PRIQ 11 /* priority queue */ #define ALTQT_JOBS 12 /* JoBS */ #define ALTQT_FAIRQ 13 /* fairq */ -#define ALTQT_CODEL 14 /* fairq */ -#define ALTQT_MAX 15 /* should be max discipline type + 1 */ +#define ALTQT_MAX 14 /* should be max discipline type + 1 */ #ifdef ALTQ3_COMPAT struct altqreq { diff --git a/sys/contrib/altq/altq/altq_cbq.c b/sys/contrib/altq/altq/altq_cbq.c index 13f9721..3991d1d 100644 --- a/sys/contrib/altq/altq/altq_cbq.c +++ b/sys/contrib/altq/altq/altq_cbq.c @@ -241,10 +241,6 @@ get_class_stats(class_stats_t *statsp, struct rm_class *cl) if (q_is_rio(cl->q_)) rio_getstats((rio_t *)cl->red_, &statsp->red[0]); #endif -#ifdef ALTQ_CODEL - if (q_is_codel(cl->q_)) - codel_getstats(cl->codel_, &statsp->codel); -#endif } int diff --git a/sys/contrib/altq/altq/altq_cbq.h b/sys/contrib/altq/altq/altq_cbq.h index 45509f0..76096af 100644 --- a/sys/contrib/altq/altq/altq_cbq.h +++ b/sys/contrib/altq/altq/altq_cbq.h @@ -37,7 +37,6 @@ #include #include #include -#include #ifdef __cplusplus extern "C" { @@ -52,7 +51,6 @@ extern "C" { #define CBQCLF_FLOWVALVE 0x0008 /* use flowvalve (aka penalty-box) */ #define CBQCLF_CLEARDSCP 0x0010 /* clear diffserv codepoint */ #define CBQCLF_BORROW 0x0020 /* borrow from parent */ -#define CBQCLF_CODEL 0x0040 /* use CODEL */ /* class flags only for root class */ #define CBQCLF_WRR 0x0100 /* weighted-round robin */ @@ -95,7 +93,6 @@ typedef struct _cbq_class_stats_ { /* red and rio related info */ int qtype; struct redstats red[3]; - struct codel_stats codel; } class_stats_t; #ifdef ALTQ3_COMPAT diff --git a/sys/contrib/altq/altq/altq_classq.h b/sys/contrib/altq/altq/altq_classq.h index 8e4d1db..dc5c646 100644 --- a/sys/contrib/altq/altq/altq_classq.h +++ b/sys/contrib/altq/altq/altq_classq.h @@ -49,7 +49,6 @@ extern "C" { #define Q_RED 0x01 #define Q_RIO 0x02 #define Q_DROPTAIL 0x03 -#define Q_CODEL 0x04 #ifdef _KERNEL @@ -59,7 +58,6 @@ extern "C" { struct _class_queue_ { struct mbuf *tail_; /* Tail of packet queue */ int qlen_; /* Queue length (in number of packets) */ - int qsize_; /* Queue size (in number of bytes*) */ int qlim_; /* Queue limit (in number of packets*) */ int qtype_; /* Queue type */ }; @@ -69,13 +67,11 @@ typedef struct _class_queue_ class_queue_t; #define qtype(q) (q)->qtype_ /* Get queue type */ #define qlimit(q) (q)->qlim_ /* Max packets to be queued */ #define qlen(q) (q)->qlen_ /* Current queue length. */ -#define qsize(q) (q)->qsize_ /* Current queue size. */ #define qtail(q) (q)->tail_ /* Tail of the queue */ #define qhead(q) ((q)->tail_ ? (q)->tail_->m_nextpkt : NULL) #define qempty(q) ((q)->qlen_ == 0) /* Is the queue empty?? */ #define q_is_red(q) ((q)->qtype_ == Q_RED) /* Is the queue a red queue */ -#define q_is_codel(q) ((q)->qtype_ == Q_CODEL) /* Is the queue a codel queue */ #define q_is_rio(q) ((q)->qtype_ == Q_RIO) /* Is the queue a rio queue */ #define q_is_red_or_rio(q) ((q)->qtype_ == Q_RED || (q)->qtype_ == Q_RIO) @@ -104,7 +100,6 @@ _addq(class_queue_t *q, struct mbuf *m) m0->m_nextpkt = m; qtail(q) = m; qlen(q)++; - qsize(q) += m_pktlen(m); } static __inline struct mbuf * @@ -119,7 +114,6 @@ _getq(class_queue_t *q) else qtail(q) = NULL; qlen(q)--; - qsize(q) -= m_pktlen(m0); m0->m_nextpkt = NULL; return (m0); } diff --git a/sys/contrib/altq/altq/altq_codel.c b/sys/contrib/altq/altq/altq_codel.c deleted file mode 100644 index cf68207..0000000 --- a/sys/contrib/altq/altq/altq_codel.c +++ /dev/null @@ -1,434 +0,0 @@ -/* - * Codel - The Controlled-Delay Active Queue Management algorithm - * - * Copyright (C) 2011-2012 Kathleen Nichols - * Copyright (C) 2011-2012 Van Jacobson - * Copyright (C) 2012 Michael D. Taht - * Copyright (C) 2012 Eric Dumazet - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions, and the following disclaimer, - * without modification. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. The names of the authors may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * Alternatively, provided that this notice is retained in full, this - * software may be distributed under the terms of the GNU General - * Public License ("GPL") version 2, in which case the provisions of the - * GPL apply INSTEAD OF those given above. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH - * DAMAGE. - * - */ - -#include -#include -#include -#include -#include - -#include -#include - -#include - -#include -#include - -static int codel_should_drop(struct codel *, class_queue_t *, - struct mbuf *, u_int64_t); -static void codel_Newton_step(struct codel_vars *); -static u_int64_t codel_control_law(u_int64_t t, u_int64_t, u_int32_t); - -#define codel_time_after(a, b) ((int64_t)(a) - (int64_t)(b) > 0) -#define codel_time_after_eq(a, b) ((int64_t)(a) - (int64_t)(b) >= 0) -#define codel_time_before(a, b) ((int64_t)(a) - (int64_t)(b) < 0) -#define codel_time_before_eq(a, b) ((int64_t)(a) - (int64_t)(b) <= 0) - -static int codel_request(struct ifaltq *, int, void *); - -static int codel_enqueue(struct ifaltq *, struct mbuf *, struct altq_pktattr *); -static struct mbuf *codel_dequeue(struct ifaltq *, int); - -int -codel_pfattach(struct pf_altq *a) -{ - struct ifnet *ifp; - int s, error; - - if ((ifp = ifunit(a->ifname)) == NULL || a->altq_disc == NULL) - return (EINVAL); -#ifdef __NetBSD__ - s = splnet(); -#else - s = splimp(); -#endif - error = altq_attach(&ifp->if_snd, ALTQT_CODEL, a->altq_disc, - codel_enqueue, codel_dequeue, codel_request, NULL, NULL); - splx(s); - return (error); -} - -int -codel_add_altq(struct pf_altq *a) -{ - struct codel_if *cif; - struct ifnet *ifp; - struct codel_opts *opts; - - if ((ifp = ifunit(a->ifname)) == NULL) - return (EINVAL); - if (!ALTQ_IS_READY(&ifp->if_snd)) - return (ENODEV); - - opts = &a->pq_u.codel_opts; - - cif = malloc(sizeof(struct codel_if), M_DEVBUF, M_NOWAIT | M_ZERO); - if (cif == NULL) - return (ENOMEM); - cif->cif_bandwidth = a->ifbandwidth; - cif->cif_ifq = &ifp->if_snd; - - cif->cl_q = malloc(sizeof(class_queue_t), M_DEVBUF, M_NOWAIT | M_ZERO); - if (cif->cl_q == NULL) { - free(cif, M_DEVBUF); - return (ENOMEM); - } - - if (a->qlimit == 0) - a->qlimit = 5; - qlimit(cif->cl_q) = a->qlimit; - qtype(cif->cl_q) = Q_CODEL; - qlen(cif->cl_q) = 0; - qsize(cif->cl_q) = 0; - - if (!opts->target) - opts->target = a->qlimit; - if (!opts->interval) - opts->interval = 100; - cif->codel.params.target = machclk_freq * opts->target / 1000; - cif->codel.params.interval = machclk_freq * opts->interval / 1000; - cif->codel.params.ecn = opts->ecn; - cif->codel.stats.maxpacket = 256; - - cif->cl_stats.qlength = qlen(cif->cl_q); - cif->cl_stats.qlimit = qlimit(cif->cl_q); - - /* keep the state in pf_altq */ - a->altq_disc = cif; - - return (0); -} - -int -codel_remove_altq(struct pf_altq *a) -{ - struct codel_if *cif; - - if ((cif = a->altq_disc) == NULL) - return (EINVAL); - a->altq_disc = NULL; - - if (cif->cl_q) - free(cif->cl_q, M_DEVBUF); - free(cif, M_DEVBUF); - return (0); -} - -int -codel_getqstats(struct pf_altq *a, void *ubuf, int *nbytes) -{ - struct codel_if *cif; - struct codel_ifstats stats; - int error = 0; - - if ((cif = altq_lookup(a->ifname, ALTQT_CODEL)) == NULL) - return (EBADF); - - if (*nbytes < sizeof(stats)) - return (EINVAL); - - stats = cif->cl_stats; - stats.stats = cif->codel.stats; - - if ((error = copyout((caddr_t)&stats, ubuf, sizeof(stats))) != 0) - return (error); - *nbytes = sizeof(stats); - return (0); -} - -static int -codel_request(struct ifaltq *ifq, int req, void *arg) -{ - struct codel_if *cif = (struct codel_if *)ifq->altq_disc; - struct mbuf *m; - - IFQ_LOCK_ASSERT(ifq); - - switch (req) { - case ALTRQ_PURGE: - if (!ALTQ_IS_ENABLED(cif->cif_ifq)) - break; - - if (qempty(cif->cl_q)) - break; - - while ((m = _getq(cif->cl_q)) != NULL) { - PKTCNTR_ADD(&cif->cl_stats.cl_dropcnt, m_pktlen(m)); - m_freem(m); - IFQ_DEC_LEN(cif->cif_ifq); - } - cif->cif_ifq->ifq_len = 0; - break; - } - return (0); -} - -static int -codel_enqueue(struct ifaltq *ifq, struct mbuf *m, struct altq_pktattr *pktattr) -{ - - struct codel_if *cif = (struct codel_if *) ifq->altq_disc; - - IFQ_LOCK_ASSERT(ifq); - - /* grab class set by classifier */ - if ((m->m_flags & M_PKTHDR) == 0) { - /* should not happen */ - printf("altq: packet for %s does not have pkthdr\n", - ifq->altq_ifp->if_xname); - m_freem(m); - PKTCNTR_ADD(&cif->cl_stats.cl_dropcnt, m_pktlen(m)); - return (ENOBUFS); - } - - if (codel_addq(&cif->codel, cif->cl_q, m)) { - PKTCNTR_ADD(&cif->cl_stats.cl_dropcnt, m_pktlen(m)); - return (ENOBUFS); - } - IFQ_INC_LEN(ifq); - - return (0); -} - -static struct mbuf * -codel_dequeue(struct ifaltq *ifq, int op) -{ - struct codel_if *cif = (struct codel_if *)ifq->altq_disc; - struct mbuf *m; - - IFQ_LOCK_ASSERT(ifq); - - if (IFQ_IS_EMPTY(ifq)) - return (NULL); - - if (op == ALTDQ_POLL) - return (qhead(cif->cl_q)); - - - m = codel_getq(&cif->codel, cif->cl_q); - if (m != NULL) { - IFQ_DEC_LEN(ifq); - PKTCNTR_ADD(&cif->cl_stats.cl_xmitcnt, m_pktlen(m)); - return (m); - } - - return (NULL); -} - -struct codel * -codel_alloc(int target, int interval, int ecn) -{ - struct codel *c; - - c = malloc(sizeof(*c), M_DEVBUF, M_NOWAIT|M_ZERO); - - c->params.target = machclk_freq * target / 1000; - c->params.interval = machclk_freq * interval / 1000; - c->params.ecn = ecn; - c->stats.maxpacket = 256; - - return (c); -} - -void -codel_destroy(struct codel *c) -{ - free(c, M_DEVBUF); -} - -int -codel_addq(struct codel *c, class_queue_t *q, struct mbuf *m) -{ - if (qlen(q) < qlimit(q)) { - m->m_pkthdr.enqueue_time = read_machclk(); - _addq(q, m); - return (0); - } - c->drop_overlimit++; - m_freem(m); - return (-1); -} - -static int -codel_should_drop(struct codel *c, class_queue_t *q, struct mbuf *m, - u_int64_t now) -{ - if (m == NULL) { - c->vars.first_above_time = 0; - return (0); - } - - c->vars.ldelay = now - m->m_pkthdr.enqueue_time; - c->stats.maxpacket = MAX(c->stats.maxpacket, m_pktlen(m)); - - if (codel_time_before(c->vars.ldelay, c->params.target) || - qsize(q) <= c->stats.maxpacket) { - /* went below - stay below for at least interval */ - c->vars.first_above_time = 0; - return (0); - } - if (c->vars.first_above_time == 0) { - /* just went above from below. If we stay above - * for at least interval we'll say it's ok to drop - */ - c->vars.first_above_time = now + c->params.interval; - return (0); - } - if (codel_time_after(now, c->vars.first_above_time)) - return (1); - return (0); -} - -/* - * http://en.wikipedia.org/wiki/Methods_of_computing_square_roots#Iterative_methods_for_reciprocal_square_roots - * new_invsqrt = (invsqrt / 2) * (3 - count * invsqrt^2) - * - * Here, invsqrt is a fixed point number (< 1.0), 32bit mantissa, aka Q0.32 - */ -static void codel_Newton_step(struct codel_vars *vars) -{ -#define REC_INV_SQRT_BITS (8 * sizeof(u_int16_t)) /* or sizeof_in_bits(rec_inv_sqrt) */ -/* needed shift to get a Q0.32 number from rec_inv_sqrt */ -#define REC_INV_SQRT_SHIFT (32 - REC_INV_SQRT_BITS) - - u_int32_t invsqrt = ((u_int32_t)vars->rec_inv_sqrt) << REC_INV_SQRT_SHIFT; - u_int32_t invsqrt2 = ((u_int64_t)invsqrt * invsqrt) >> 32; - u_int64_t val = (3LL << 32) - ((u_int64_t)vars->count * invsqrt2); - - val >>= 2; /* avoid overflow in following multiply */ - val = (val * invsqrt) >> (32 - 2 + 1); - - vars->rec_inv_sqrt = val >> REC_INV_SQRT_SHIFT; -} - -static u_int64_t -codel_control_law(u_int64_t t, u_int64_t interval, u_int32_t rec_inv_sqrt) -{ - return (t + (u_int32_t)(((u_int64_t)interval * - (rec_inv_sqrt << REC_INV_SQRT_SHIFT)) >> 32)); -} - -struct mbuf * -codel_getq(struct codel *c, class_queue_t *q) -{ - struct mbuf *m; - u_int64_t now; - int drop; - - if ((m = _getq(q)) == NULL) { - c->vars.dropping = 0; - return (m); - } - - now = read_machclk(); - drop = codel_should_drop(c, q, m, now); - if (c->vars.dropping) { - if (!drop) { - /* sojourn time below target - leave dropping state */ - c->vars.dropping = 0; - } else if (codel_time_after_eq(now, c->vars.drop_next)) { - /* It's time for the next drop. Drop the current - * packet and dequeue the next. The dequeue might - * take us out of dropping state. - * If not, schedule the next drop. - * A large backlog might result in drop rates so high - * that the next drop should happen now, - * hence the while loop. - */ - while (c->vars.dropping && - codel_time_after_eq(now, c->vars.drop_next)) { - c->vars.count++; /* don't care of possible wrap - * since there is no more - * divide */ - codel_Newton_step(&c->vars); - /* TODO ECN */ - PKTCNTR_ADD(&c->stats.drop_cnt, m_pktlen(m)); - m_freem(m); - m = _getq(q); - if (!codel_should_drop(c, q, m, now)) - /* leave dropping state */ - c->vars.dropping = 0; - else - /* and schedule the next drop */ - c->vars.drop_next = - codel_control_law(c->vars.drop_next, - c->params.interval, - c->vars.rec_inv_sqrt); - } - } - } else if (drop) { - /* TODO ECN */ - PKTCNTR_ADD(&c->stats.drop_cnt, m_pktlen(m)); - m_freem(m); - - m = _getq(q); - drop = codel_should_drop(c, q, m, now); - - c->vars.dropping = 1; - /* if min went above target close to when we last went below it - * assume that the drop rate that controlled the queue on the - * last cycle is a good starting point to control it now. - */ - if (codel_time_before(now - c->vars.drop_next, - 16 * c->params.interval)) { - c->vars.count = (c->vars.count - c->vars.lastcount) | 1; - /* we dont care if rec_inv_sqrt approximation - * is not very precise : - * Next Newton steps will correct it quadratically. - */ - codel_Newton_step(&c->vars); - } else { - c->vars.count = 1; - c->vars.rec_inv_sqrt = ~0U >> REC_INV_SQRT_SHIFT; - } - c->vars.lastcount = c->vars.count; - c->vars.drop_next = codel_control_law(now, c->params.interval, - c->vars.rec_inv_sqrt); - } - - return m; -} - -void -codel_getstats(struct codel *c, struct codel_stats *s) -{ - *s = c->stats; -} diff --git a/sys/contrib/altq/altq/altq_codel.h b/sys/contrib/altq/altq/altq_codel.h deleted file mode 100644 index 9413ae1..0000000 --- a/sys/contrib/altq/altq/altq_codel.h +++ /dev/null @@ -1,87 +0,0 @@ -#ifndef _ALTQ_ALTQ_CODEL_H_ -#define _ALTQ_ALTQ_CODEL_H_ - -struct codel_stats { - u_int32_t maxpacket; - struct pktcntr drop_cnt; - u_int marked_packets; -}; - -struct codel_ifstats { - u_int qlength; - u_int qlimit; - struct codel_stats stats; - struct pktcntr cl_xmitcnt; /* transmitted packet counter */ - struct pktcntr cl_dropcnt; /* dropped packet counter */ -}; - -#ifdef _KERNEL -#include - -/** - * struct codel_params - contains codel parameters - * target: target queue size (in time units) - * interval: width of moving time window - * ecn: is Explicit Congestion Notification enabled - */ -struct codel_params { - u_int64_t target; - u_int64_t interval; - int ecn; -}; - -/** - * struct codel_vars - contains codel variables - * count: how many drops we've done since the last time we - * entered dropping state - * lastcount: count at entry to dropping state - * dropping: set to true if in dropping state - * rec_inv_sqrt: reciprocal value of sqrt(count) >> 1 - * first_above_time: when we went (or will go) continuously above target - * for interval - * drop_next: time to drop next packet, or when we dropped last - * ldelay: sojourn time of last dequeued packet - */ -struct codel_vars { - u_int32_t count; - u_int32_t lastcount; - int dropping; - u_int16_t rec_inv_sqrt; - u_int64_t first_above_time; - u_int64_t drop_next; - u_int64_t ldelay; -}; - -struct codel { - struct codel_params params; - struct codel_vars vars; - struct codel_stats stats; - u_int32_t drop_overlimit; -}; - -/* - * codel interface state - */ -struct codel_if { - struct codel_if *cif_next; /* interface state list */ - struct ifaltq *cif_ifq; /* backpointer to ifaltq */ - u_int cif_bandwidth; /* link bandwidth in bps */ - - class_queue_t *cl_q; /* class queue structure */ - struct codel codel; - - /* statistics */ - struct codel_ifstats cl_stats; -}; - -struct codel; - -struct codel *codel_alloc(int, int, int); -void codel_destroy(struct codel *); -int codel_addq(struct codel *, class_queue_t *, struct mbuf *); -struct mbuf *codel_getq(struct codel *, class_queue_t *); -void codel_getstats(struct codel *, struct codel_stats *); - -#endif - -#endif /* _ALTQ_ALTQ_CODEL_H_ */ diff --git a/sys/contrib/altq/altq/altq_fairq.c b/sys/contrib/altq/altq/altq_fairq.c index a32f1c8..2267bfd 100644 --- a/sys/contrib/altq/altq/altq_fairq.c +++ b/sys/contrib/altq/altq/altq_fairq.c @@ -156,7 +156,10 @@ fairq_add_altq(struct pf_altq *a) MALLOC(pif, struct fairq_if *, sizeof(struct fairq_if), - M_DEVBUF, M_WAITOK|M_ZERO); + M_DEVBUF, M_WAITOK); + if (pif == NULL) + return (ENOMEM); + bzero(pif, sizeof(struct fairq_if)); pif->pif_bandwidth = a->ifbandwidth; pif->pif_maxpri = -1; pif->pif_ifq = &ifp->if_snd; @@ -315,14 +318,6 @@ fairq_class_create(struct fairq_if *pif, int pri, int qlimit, return (NULL); } #endif -#ifndef ALTQ_CODEL - if (flags & FARF_CODEL) { -#ifdef ALTQ_DEBUG - printf("fairq_class_create: CODEL not configured for FAIRQ!\n"); -#endif - return (NULL); - } -#endif if (nbuckets == 0) nbuckets = 256; if (nbuckets > FAIRQ_MAX_BUCKETS) @@ -347,10 +342,6 @@ fairq_class_create(struct fairq_if *pif, int pri, int qlimit, if (cl->cl_qtype == Q_RED) red_destroy(cl->cl_red); #endif -#ifdef ALTQ_CODEL - if (cl->cl_qtype == Q_CODEL) - codel_destroy(cl->cl_codel); -#endif } else { MALLOC(cl, struct fairq_class *, sizeof(struct fairq_class), M_DEVBUF, M_WAITOK); @@ -424,12 +415,6 @@ fairq_class_create(struct fairq_if *pif, int pri, int qlimit, } } #endif /* ALTQ_RED */ -#ifdef ALTQ_CODEL - if (flags & FARF_CODEL) { - cl->cl_codel = codel_alloc(5, 100, 0); - cl->cl_qtype = Q_CODEL; - } -#endif return (cl); @@ -446,10 +431,6 @@ err_ret: if (cl->cl_qtype == Q_RED) red_destroy(cl->cl_red); #endif -#ifdef ALTQ_CODEL - if (cl->cl_qtype == Q_CODEL) - codel_destroy(cl->cl_codel); -#endif } if (cl != NULL) FREE(cl, M_DEVBUF); @@ -493,10 +474,6 @@ fairq_class_destroy(struct fairq_class *cl) if (cl->cl_qtype == Q_RED) red_destroy(cl->cl_red); #endif -#ifdef ALTQ_CODEL - if (cl->cl_qtype == Q_CODEL) - codel_destroy(cl->cl_codel); -#endif } FREE(cl->cl_buckets, M_DEVBUF); cl->cl_head = NULL; /* sanity */ @@ -694,10 +671,6 @@ fairq_addq(struct fairq_class *cl, struct mbuf *m, u_int32_t bucketid) if (cl->cl_qtype == Q_RED) return red_addq(cl->cl_red, &b->queue, m, cl->cl_pktattr); #endif -#ifdef ALTQ_CODEL - if (cl->cl_qtype == Q_CODEL) - return codel_addq(cl->cl_codel, &b->queue, m); -#endif if (qlen(&b->queue) >= qlimit(&b->queue)) { m_freem(m); return (-1); @@ -728,10 +701,6 @@ fairq_getq(struct fairq_class *cl, uint64_t cur_time) else if (cl->cl_qtype == Q_RED) m = red_getq(cl->cl_red, &b->queue); #endif -#ifdef ALTQ_CODEL - else if (cl->cl_qtype == Q_CODEL) - m = codel_getq(cl->cl_codel, &b->queue); -#endif else m = _getq(&b->queue); @@ -913,10 +882,6 @@ get_class_stats(struct fairq_classstats *sp, struct fairq_class *cl) if (cl->cl_qtype == Q_RIO) rio_getstats((rio_t *)cl->cl_red, &sp->red[0]); #endif -#ifdef ALTQ_CODEL - if (cl->cl_qtype == Q_CODEL) - codel_getstats(cl->cl_codel, &sp->codel); -#endif } /* convert a class handle to the corresponding class pointer */ diff --git a/sys/contrib/altq/altq/altq_fairq.h b/sys/contrib/altq/altq/altq_fairq.h index f13513b..e4675e0 100644 --- a/sys/contrib/altq/altq/altq_fairq.h +++ b/sys/contrib/altq/altq/altq_fairq.h @@ -42,7 +42,6 @@ #include #include #include -#include #define FAIRQ_MAX_BUCKETS 2048 /* maximum number of sorting buckets */ #define FAIRQ_MAXPRI RM_MAXPRIO @@ -53,7 +52,6 @@ #define FARF_RED 0x0001 /* use RED */ #define FARF_ECN 0x0002 /* use RED/ECN */ #define FARF_RIO 0x0004 /* use RIO */ -#define FARF_CODEL 0x0008 /* use CODEL */ #define FARF_CLEARDSCP 0x0010 /* clear diffserv codepoint */ #define FARF_DEFAULTCLASS 0x1000 /* default class */ @@ -78,7 +76,6 @@ struct fairq_classstats { /* red and rio related info */ int qtype; struct redstats red[3]; /* rio has 3 red stats */ - struct codel_stats codel; }; #ifdef _KERNEL @@ -100,10 +97,7 @@ struct fairq_class { fairq_bucket_t *cl_buckets; fairq_bucket_t *cl_head; /* head of circular bucket list */ fairq_bucket_t *cl_polled; - union { - struct red *cl_red; /* RED state */ - struct codel *cl_codel; - } cl_aqm; + struct red *cl_red; /* RED state */ u_int cl_hogs_m1; u_int cl_lssc_m1; u_int cl_bandwidth; @@ -123,8 +117,6 @@ struct fairq_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 /* * fairq interface state diff --git a/sys/contrib/altq/altq/altq_hfsc.c b/sys/contrib/altq/altq/altq_hfsc.c index 0ec0054..0363016 100644 --- a/sys/contrib/altq/altq/altq_hfsc.c +++ b/sys/contrib/altq/altq/altq_hfsc.c @@ -391,14 +391,6 @@ hfsc_class_create(struct hfsc_if *hif, struct service_curve *rsc, return (NULL); } #endif -#ifndef ALTQ_CODEL - if (flags & HFCF_CODEL) { -#ifdef ALTQ_DEBUG - printf("hfsc_class_create: CODEL not configured for HFSC!\n"); -#endif - return (NULL); - } -#endif cl = malloc(sizeof(struct hfsc_class), M_DEVBUF, M_NOWAIT | M_ZERO); if (cl == NULL) @@ -415,7 +407,6 @@ hfsc_class_create(struct hfsc_if *hif, struct service_curve *rsc, qlimit(cl->cl_q) = qlimit; qtype(cl->cl_q) = Q_DROPTAIL; qlen(cl->cl_q) = 0; - qsize(cl->cl_q) = 0; cl->cl_flags = flags; #ifdef ALTQ_RED if (flags & (HFCF_RED|HFCF_RIO)) { @@ -460,12 +451,6 @@ hfsc_class_create(struct hfsc_if *hif, struct service_curve *rsc, #endif } #endif /* ALTQ_RED */ -#ifdef ALTQ_CODEL - if (flags & HFCF_CODEL) { - cl->cl_codel = codel_alloc(5, 100, 0); - qtype(cl->cl_q) = Q_CODEL; - } -#endif if (rsc != NULL && (rsc->m1 != 0 || rsc->m2 != 0)) { cl->cl_rsc = malloc(sizeof(struct internal_sc), @@ -558,10 +543,6 @@ hfsc_class_create(struct hfsc_if *hif, struct service_curve *rsc, if (q_is_red(cl->cl_q)) red_destroy(cl->cl_red); #endif -#ifdef ALTQ_CODEL - if (q_is_codel(cl->cl_q)) - codel_destroy(cl->cl_codel); -#endif } if (cl->cl_fsc != NULL) free(cl->cl_fsc, M_DEVBUF); @@ -636,10 +617,6 @@ hfsc_class_destroy(struct hfsc_class *cl) if (q_is_red(cl->cl_q)) red_destroy(cl->cl_red); #endif -#ifdef ALTQ_CODEL - if (q_is_codel(cl->cl_q)) - codel_destroy(cl->cl_codel); -#endif } IFQ_LOCK(cl->cl_hif->hif_ifq); @@ -867,10 +844,6 @@ hfsc_addq(struct hfsc_class *cl, struct mbuf *m) if (q_is_red(cl->cl_q)) return red_addq(cl->cl_red, cl->cl_q, m, cl->cl_pktattr); #endif -#ifdef ALTQ_CODEL - if (q_is_codel(cl->cl_q)) - return codel_addq(cl->cl_codel, cl->cl_q, m); -#endif if (qlen(cl->cl_q) >= qlimit(cl->cl_q)) { m_freem(m); return (-1); @@ -895,10 +868,6 @@ hfsc_getq(struct hfsc_class *cl) if (q_is_red(cl->cl_q)) return red_getq(cl->cl_red, cl->cl_q); #endif -#ifdef ALTQ_CODEL - if (q_is_codel(cl->cl_q)) - return codel_getq(cl->cl_codel, cl->cl_q); -#endif return _getq(cl->cl_q); } @@ -1683,10 +1652,6 @@ get_class_stats(struct hfsc_classstats *sp, struct hfsc_class *cl) if (q_is_rio(cl->cl_q)) rio_getstats((rio_t *)cl->cl_red, &sp->red[0]); #endif -#ifdef ALTQ_CODEL - if (q_is_codel(cl->cl_q)) - codel_getstats(cl->cl_codel, &sp->codel); -#endif } /* convert a class handle to the corresponding class pointer */ diff --git a/sys/contrib/altq/altq/altq_hfsc.h b/sys/contrib/altq/altq/altq_hfsc.h index c8e9b13..e5595cb 100644 --- a/sys/contrib/altq/altq/altq_hfsc.h +++ b/sys/contrib/altq/altq/altq_hfsc.h @@ -36,7 +36,6 @@ #include #include #include -#include #ifdef __cplusplus extern "C" { @@ -56,7 +55,6 @@ struct service_curve { #define HFCF_RED 0x0001 /* use RED */ #define HFCF_ECN 0x0002 /* use RED/ECN */ #define HFCF_RIO 0x0004 /* use RIO */ -#define HFCF_CODEL 0x0008 /* use CODEL */ #define HFCF_CLEARDSCP 0x0010 /* clear diffserv codepoint */ #define HFCF_DEFAULTCLASS 0x1000 /* default class */ @@ -106,7 +104,6 @@ struct hfsc_classstats { /* red and rio related info */ int qtype; struct redstats red[3]; - struct codel_stats codel; }; #ifdef ALTQ3_COMPAT @@ -232,10 +229,7 @@ struct hfsc_class { struct hfsc_class *cl_children; /* child classes */ 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 */ struct altq_pktattr *cl_pktattr; /* saved header used by ECN */ u_int64_t cl_total; /* total work in bytes */ @@ -284,8 +278,6 @@ struct hfsc_class { u_int period; } cl_stats; }; -#define cl_red cl_aqm.cl_red -#define cl_codel cl_aqm.cl_codel /* * hfsc interface state diff --git a/sys/contrib/altq/altq/altq_priq.c b/sys/contrib/altq/altq/altq_priq.c index 2e8657c..3ce65dc 100644 --- a/sys/contrib/altq/altq/altq_priq.c +++ b/sys/contrib/altq/altq/altq_priq.c @@ -297,14 +297,6 @@ priq_class_create(struct priq_if *pif, int pri, int qlimit, int flags, int qid) return (NULL); } #endif -#ifndef ALTQ_CODEL - if (flags & PRCF_CODEL) { -#ifdef ALTQ_DEBUG - printf("priq_class_create: CODEL not configured for PRIQ!\n"); -#endif - return (NULL); - } -#endif if ((cl = pif->pif_classes[pri]) != NULL) { /* modify the class instead of creating a new one */ @@ -326,10 +318,6 @@ priq_class_create(struct priq_if *pif, int pri, int qlimit, int flags, int qid) if (q_is_red(cl->cl_q)) red_destroy(cl->cl_red); #endif -#ifdef ALTQ_CODEL - if (q_is_codel(cl->cl_q)) - codel_destroy(cl->cl_codel); -#endif } else { cl = malloc(sizeof(struct priq_class), M_DEVBUF, M_NOWAIT | M_ZERO); @@ -350,7 +338,6 @@ priq_class_create(struct priq_if *pif, int pri, int qlimit, int flags, int qid) qlimit(cl->cl_q) = qlimit; qtype(cl->cl_q) = Q_DROPTAIL; qlen(cl->cl_q) = 0; - qsize(cl->cl_q) = 0; cl->cl_flags = flags; cl->cl_pri = pri; if (pri > pif->pif_maxpri) @@ -394,12 +381,6 @@ priq_class_create(struct priq_if *pif, int pri, int qlimit, int flags, int qid) } } #endif /* ALTQ_RED */ -#ifdef ALTQ_CODEL - if (flags & PRCF_CODEL) { - cl->cl_codel = codel_alloc(5, 100, 0); - qtype(cl->cl_q) = Q_CODEL; - } -#endif return (cl); @@ -413,10 +394,6 @@ priq_class_create(struct priq_if *pif, int pri, int qlimit, int flags, int qid) if (q_is_red(cl->cl_q)) red_destroy(cl->cl_red); #endif -#ifdef ALTQ_CODEL - if (q_is_codel(cl->cl_q)) - codel_destroy(cl->cl_codel); -#endif } if (cl->cl_q != NULL) free(cl->cl_q, M_DEVBUF); @@ -468,10 +445,6 @@ priq_class_destroy(struct priq_class *cl) if (q_is_red(cl->cl_q)) red_destroy(cl->cl_red); #endif -#ifdef ALTQ_CODEL - if (q_is_codel(cl->cl_q)) - codel_destroy(cl->cl_codel); -#endif } free(cl->cl_q, M_DEVBUF); free(cl, M_DEVBUF); @@ -587,10 +560,6 @@ priq_addq(struct priq_class *cl, struct mbuf *m) if (q_is_red(cl->cl_q)) return red_addq(cl->cl_red, cl->cl_q, m, cl->cl_pktattr); #endif -#ifdef ALTQ_CODEL - if (q_is_codel(cl->cl_q)) - return codel_addq(cl->cl_codel, cl->cl_q, m); -#endif if (qlen(cl->cl_q) >= qlimit(cl->cl_q)) { m_freem(m); return (-1); @@ -615,10 +584,6 @@ priq_getq(struct priq_class *cl) if (q_is_red(cl->cl_q)) return red_getq(cl->cl_red, cl->cl_q); #endif -#ifdef ALTQ_CODEL - if (q_is_codel(cl->cl_q)) - return codel_getq(cl->cl_codel, cl->cl_q); -#endif return _getq(cl->cl_q); } @@ -663,10 +628,6 @@ get_class_stats(struct priq_classstats *sp, struct priq_class *cl) if (q_is_rio(cl->cl_q)) rio_getstats((rio_t *)cl->cl_red, &sp->red[0]); #endif -#ifdef ALTQ_CODEL - if (q_is_codel(cl->cl_q)) - codel_getstats(cl->cl_codel, &sp->codel); -#endif } 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 #include #include -#include #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 */ diff --git a/sys/contrib/altq/altq/altq_rmclass.c b/sys/contrib/altq/altq/altq_rmclass.c index 74db423..c433024 100644 --- a/sys/contrib/altq/altq/altq_rmclass.c +++ b/sys/contrib/altq/altq/altq_rmclass.c @@ -72,7 +72,6 @@ #include #include #include -#include /* * Local Macros @@ -219,14 +218,6 @@ rmc_newclass(int pri, struct rm_ifdat *ifd, u_int nsecPerByte, return (NULL); } #endif -#ifndef ALTQ_CODEL - if (flags & RMCF_CODEL) { -#ifdef ALTQ_DEBUG - printf("rmc_newclass: CODEL not configured for CBQ!\n"); -#endif - return (NULL); - } -#endif cl = malloc(sizeof(struct rm_class), M_DEVBUF, M_NOWAIT | M_ZERO); if (cl == NULL) @@ -311,12 +302,6 @@ rmc_newclass(int pri, struct rm_ifdat *ifd, u_int nsecPerByte, #endif } #endif /* ALTQ_RED */ -#ifdef ALTQ_CODEL - if (flags & RMCF_CODEL) { - cl->codel_ = codel_alloc(5, 100, 0); - qtype(cl->q_) = Q_CODEL; - } -#endif /* * put the class into the class tree @@ -667,10 +652,6 @@ rmc_delete_class(struct rm_ifdat *ifd, struct rm_class *cl) if (q_is_red(cl->q_)) red_destroy(cl->red_); #endif -#ifdef ALTQ_CODEL - if (q_is_codel(cl->q_)) - codel_destroy(cl->codel_); -#endif } free(cl->q_, M_DEVBUF); free(cl, M_DEVBUF); @@ -1637,10 +1618,6 @@ _rmc_addq(rm_class_t *cl, mbuf_t *m) if (q_is_red(cl->q_)) return red_addq(cl->red_, cl->q_, m, cl->pktattr_); #endif /* ALTQ_RED */ -#ifdef ALTQ_CODEL - if (q_is_codel(cl->q_)) - return codel_addq(cl->codel_, cl->q_, m); -#endif /* ALTQ_RED */ if (cl->flags_ & RMCF_CLEARDSCP) write_dsfield(m, cl->pktattr_, 0); @@ -1670,10 +1647,6 @@ _rmc_getq(rm_class_t *cl) if (q_is_red(cl->q_)) return red_getq(cl->red_, cl->q_); #endif -#ifdef ALTQ_CODEL - if (q_is_codel(cl->q_)) - return codel_getq(cl->codel_, cl->q_); -#endif return _getq(cl->q_); } @@ -1744,7 +1717,7 @@ void cbqtrace_dump(int counter) #endif /* CBQ_TRACE */ #endif /* ALTQ_CBQ */ -#if defined(ALTQ_CBQ) || defined(ALTQ_RED) || defined(ALTQ_RIO) || defined(ALTQ_HFSC) || defined(ALTQ_PRIQ) || defined(ALTQ_CODEL) +#if defined(ALTQ_CBQ) || defined(ALTQ_RED) || defined(ALTQ_RIO) || defined(ALTQ_HFSC) || defined(ALTQ_PRIQ) #if !defined(__GNUC__) || defined(ALTQ_DEBUG) void diff --git a/sys/contrib/altq/altq/altq_rmclass.h b/sys/contrib/altq/altq/altq_rmclass.h index bd87591..cf0ddf4 100644 --- a/sys/contrib/altq/altq/altq_rmclass.h +++ b/sys/contrib/altq/altq/altq_rmclass.h @@ -53,7 +53,6 @@ typedef struct rm_ifdat rm_ifdat_t; typedef struct rm_class rm_class_t; struct red; -struct codel; /* * Macros for dealing with time values. We assume all times are @@ -165,10 +164,7 @@ struct rm_class { void (*overlimit)(struct rm_class *, struct rm_class *); void (*drop)(struct rm_class *); /* Class drop action. */ - union { - struct red *red_; /* RED state pointer */ - struct codel *codel; - } cl_aqm; + struct red *red_; /* RED state pointer */ struct altq_pktattr *pktattr_; /* saved hdr used by RED/ECN */ int flags_; @@ -180,8 +176,6 @@ struct rm_class { rm_class_stats_t stats_; /* Class Statistics */ }; -#define red_ cl_aqm.red_ -#define codel_ cl_aqm.codel /* * CBQ Interface state @@ -239,7 +233,6 @@ struct rm_ifdat { #define RMCF_RIO 0x0004 #define RMCF_FLOWVALVE 0x0008 /* use flowvalve (aka penalty-box) */ #define RMCF_CLEARDSCP 0x0010 /* clear diffserv codepoint */ -#define RMCF_CODEL 0x0040 /* flags for rmc_init */ #define RMCF_WRR 0x0100 diff --git a/sys/contrib/altq/altq/altq_subr.c b/sys/contrib/altq/altq/altq_subr.c index fff1b49..d59751a 100644 --- a/sys/contrib/altq/altq/altq_subr.c +++ b/sys/contrib/altq/altq/altq_subr.c @@ -542,11 +542,6 @@ altq_pfattach(struct pf_altq *a) error = fairq_pfattach(a); break; #endif -#ifdef ALTQ_CODEL - case ALTQT_CODEL: - error = codel_pfattach(a); - break; -#endif default: error = ENXIO; } @@ -627,11 +622,6 @@ altq_add(struct pf_altq *a) error = fairq_add_altq(a); break; #endif -#ifdef ALTQ_CODEL - case ALTQT_CODEL: - error = codel_add_altq(a); - break; -#endif default: error = ENXIO; } @@ -673,11 +663,6 @@ altq_remove(struct pf_altq *a) error = fairq_remove_altq(a); break; #endif -#ifdef ALTQ_CODEL - case ALTQT_CODEL: - error = codel_remove_altq(a); - break; -#endif default: error = ENXIO; } @@ -792,11 +777,6 @@ altq_getqstats(struct pf_altq *a, void *ubuf, int *nbytes) error = fairq_getqstats(a, ubuf, nbytes); break; #endif -#ifdef ALTQ_CODEL - case ALTQT_CODEL: - error = codel_getqstats(a, ubuf, nbytes); - break; -#endif default: error = ENXIO; } diff --git a/sys/contrib/altq/altq/altq_var.h b/sys/contrib/altq/altq/altq_var.h index 6ea7b7c..eb603ea 100644 --- a/sys/contrib/altq/altq/altq_var.h +++ b/sys/contrib/altq/altq/altq_var.h @@ -250,11 +250,6 @@ int priq_add_queue(struct pf_altq *); int priq_remove_queue(struct pf_altq *); int priq_getqstats(struct pf_altq *, void *, int *); -int codel_pfattach(struct pf_altq *); -int codel_add_altq(struct pf_altq *); -int codel_remove_altq(struct pf_altq *); -int codel_getqstats(struct pf_altq *, void *, int *); - int hfsc_pfattach(struct pf_altq *); int hfsc_add_altq(struct pf_altq *); int hfsc_remove_altq(struct pf_altq *); diff --git a/sys/netpfil/pf/pf_altq.h b/sys/netpfil/pf/pf_altq.h index 184e453..db681fb 100644 --- a/sys/netpfil/pf/pf_altq.h +++ b/sys/netpfil/pf/pf_altq.h @@ -79,12 +79,6 @@ struct fairq_opts { u_int lssc_m2; }; -struct codel_opts { - u_int target; - u_int interval; - int ecn; -}; - struct pf_altq { char ifname[IFNAMSIZ]; @@ -112,7 +106,6 @@ struct pf_altq { struct priq_opts priq_opts; struct hfsc_opts hfsc_opts; struct fairq_opts fairq_opts; - struct codel_opts codel_opts; } pq_u; uint32_t qid; /* return value */ diff --git a/sys/sys/mbuf.h b/sys/sys/mbuf.h index 6d82ee0..7ff8c2f 100644 --- a/sys/sys/mbuf.h +++ b/sys/sys/mbuf.h @@ -128,7 +128,6 @@ struct pkthdr { uint32_t flowid; /* packet's 4-tuple system */ uint64_t csum_flags; /* checksum and offload features */ uint16_t fibnum; /* this packet should use this fib */ - uint64_t enqueue_time; uint8_t cosqos; /* class/quality of service */ uint8_t rsstype; /* hash type */ uint8_t l2hlen; /* layer 2 header length */ -- cgit v1.1