diff options
| author | Henning Brauer <henning@cvs.openbsd.org> | 2011-07-03 23:59:44 +0000 |
|---|---|---|
| committer | Henning Brauer <henning@cvs.openbsd.org> | 2011-07-03 23:59:44 +0000 |
| commit | 83041e559f3063321d066902536d1e73bd778e23 (patch) | |
| tree | fd97bcf1416283867ec63dc5b1340b51379b69e5 /sys/altq/altq_priq.c | |
| parent | 69c6e3e717bc952ed47f81420147377d3ee74a7d (diff) | |
g/c RIO traces (aka clean up after tedu :))
Diffstat (limited to 'sys/altq/altq_priq.c')
| -rw-r--r-- | sys/altq/altq_priq.c | 33 |
1 files changed, 2 insertions, 31 deletions
diff --git a/sys/altq/altq_priq.c b/sys/altq/altq_priq.c index 437e8d6d9cf..9d3eb5dc650 100644 --- a/sys/altq/altq_priq.c +++ b/sys/altq/altq_priq.c @@ -1,4 +1,4 @@ -/* $OpenBSD: altq_priq.c,v 1.23 2011/07/03 23:48:41 henning Exp $ */ +/* $OpenBSD: altq_priq.c,v 1.24 2011/07/03 23:59:43 henning Exp $ */ /* $KAME: altq_priq.c,v 1.1 2000/10/18 09:15:23 kjc Exp $ */ /* * Copyright (C) 2000 @@ -253,10 +253,6 @@ priq_class_create(struct priq_if *pif, int pri, int qlimit, int flags, int qid) if (!qempty(cl->cl_q)) priq_purgeq(cl); splx(s); -#ifdef ALTQ_RIO - if (q_is_rio(cl->cl_q)) - rio_destroy((rio_t *)cl->cl_red); -#endif #ifdef ALTQ_RED if (q_is_red(cl->cl_q)) red_destroy(cl->cl_red); @@ -285,7 +281,7 @@ priq_class_create(struct priq_if *pif, int pri, int qlimit, int flags, int qid) cl->cl_handle = qid; #ifdef ALTQ_RED - if (flags & (PRCF_RED|PRCF_RIO)) { + if (flags & PRCF_RED) { int red_flags, red_pkttime; red_flags = 0; @@ -296,13 +292,6 @@ priq_class_create(struct priq_if *pif, int pri, int qlimit, int flags, int qid) else red_pkttime = (int64_t)pif->pif_ifq->altq_ifp->if_mtu * 1000 * 1000 * 1000 / (pif->pif_bandwidth / 8); -#ifdef ALTQ_RIO - if (flags & PRCF_RIO) { - cl->cl_red = (red_t *)rio_alloc(0, NULL, - red_flags, red_pkttime); - qtype(cl->cl_q) = Q_RIO; - } else -#endif if (flags & PRCF_RED) { cl->cl_red = red_alloc(0, 0, qlimit(cl->cl_q) * 10/100, @@ -341,10 +330,6 @@ priq_class_destroy(struct priq_class *cl) splx(s); if (cl->cl_red != NULL) { -#ifdef ALTQ_RIO - if (q_is_rio(cl->cl_q)) - rio_destroy((rio_t *)cl->cl_red); -#endif #ifdef ALTQ_RED if (q_is_red(cl->cl_q)) red_destroy(cl->cl_red); @@ -439,11 +424,6 @@ static int priq_addq(struct priq_class *cl, struct mbuf *m) { -#ifdef ALTQ_RIO - if (q_is_rio(cl->cl_q)) - return rio_addq((rio_t *)cl->cl_red, cl->cl_q, m, - cl->cl_pktattr); -#endif #ifdef ALTQ_RED if (q_is_red(cl->cl_q)) return red_addq(cl->cl_red, cl->cl_q, m, cl->cl_pktattr); @@ -461,10 +441,6 @@ priq_addq(struct priq_class *cl, struct mbuf *m) static struct mbuf * priq_getq(struct priq_class *cl) { -#ifdef ALTQ_RIO - if (q_is_rio(cl->cl_q)) - return rio_getq((rio_t *)cl->cl_red, cl->cl_q); -#endif #ifdef ALTQ_RED if (q_is_red(cl->cl_q)) return red_getq(cl->cl_red, cl->cl_q); @@ -509,11 +485,6 @@ get_class_stats(struct priq_classstats *sp, struct priq_class *cl) if (q_is_red(cl->cl_q)) red_getstats(cl->cl_red, &sp->red[0]); #endif -#ifdef ALTQ_RIO - if (q_is_rio(cl->cl_q)) - rio_getstats((rio_t *)cl->cl_red, &sp->red[0]); -#endif - } /* convert a class handle to the corresponding class pointer */ |