1 files changed, 3 insertions, 35 deletions

diff --git a/sbin/pfctl/pfctl_qstats.c b/sbin/pfctl/pfctl_qstats.c
index 8ffd87d..4087d71 100644
--- a/sbin/pfctl/pfctl_qstats.c
+++ b/sbin/pfctl/pfctl_qstats.c
@@ -36,7 +36,6 @@ __FBSDID("$FreeBSD$");
 
 #include <altq/altq.h>
 #include <altq/altq_cbq.h>
-#include <altq/altq_codel.h>
 #include <altq/altq_priq.h>
 #include <altq/altq_hfsc.h>
 #include <altq/altq_fairq.h>
@@ -49,7 +48,6 @@ union class_stats {
 	struct priq_classstats	priq_stats;
 	struct hfsc_classstats	hfsc_stats;
 	struct fairq_classstats fairq_stats;
-	struct codel_ifstats	codel_stats;
 };
 
 #define AVGN_MAX	8
@@ -79,7 +77,6 @@ struct pf_altq_node	*pfctl_find_altq_node(struct pf_altq_node *,
 void			 pfctl_print_altq_node(int, const struct pf_altq_node *,
 			    unsigned, int);
 void			 print_cbqstats(struct queue_stats);
-void			 print_codelstats(struct queue_stats);
 void			 print_priqstats(struct queue_stats);
 void			 print_hfscstats(struct queue_stats);
 void			 print_fairqstats(struct queue_stats);
@@ -168,7 +165,7 @@ pfctl_update_qstats(int dev, struct pf_altq_node **root)
 			return (-1);
 		}
 #ifdef __FreeBSD__
-		if ((pa.altq.qid > 0 || pa.altq.scheduler == ALTQT_CODEL) &&
+		if (pa.altq.qid > 0 &&
 		    !(pa.altq.local_flags & PFALTQ_FLAG_IF_REMOVED)) {
 #else
 		if (pa.altq.qid > 0) {
@@ -306,7 +303,7 @@ pfctl_print_altq_node(int dev, const struct pf_altq_node *node,
 void
 pfctl_print_altq_nodestat(int dev, const struct pf_altq_node *a)
 {
-	if (a->altq.qid == 0 && a->altq.scheduler != ALTQT_CODEL)
+	if (a->altq.qid == 0)
 		return;
 
 #ifdef __FreeBSD__
@@ -326,9 +323,6 @@ pfctl_print_altq_nodestat(int dev, const struct pf_altq_node *a)
 	case ALTQT_FAIRQ:
 		print_fairqstats(a->qstats);
 		break;
-	case ALTQT_CODEL:
-		print_codelstats(a->qstats);
-		break;
 	}
 }
 
@@ -354,28 +348,6 @@ print_cbqstats(struct queue_stats cur)
 }
 
 void
-print_codelstats(struct queue_stats cur)
-{
-	printf("  [ pkts: %10llu  bytes: %10llu  "
-	    "dropped pkts: %6llu bytes: %6llu ]\n",
-	    (unsigned long long)cur.data.codel_stats.cl_xmitcnt.packets,
-	    (unsigned long long)cur.data.codel_stats.cl_xmitcnt.bytes,
-	    (unsigned long long)cur.data.codel_stats.cl_dropcnt.packets +
-	    cur.data.codel_stats.stats.drop_cnt.packets,
-	    (unsigned long long)cur.data.codel_stats.cl_dropcnt.bytes +
-	    cur.data.codel_stats.stats.drop_cnt.bytes);
-	printf("  [ qlength: %3d/%3d ]\n",
-	    cur.data.codel_stats.qlength, cur.data.codel_stats.qlimit);
-
-	if (cur.avgn < 2)
-		return;
-
-	printf("  [ measured: %7.1f packets/s, %s/s ]\n",
-	    cur.avg_packets / STAT_INTERVAL,
-	    rate2str((8 * cur.avg_bytes) / STAT_INTERVAL));
-}
-
-void
 print_priqstats(struct queue_stats cur)
 {
 	printf("  [ pkts: %10llu  bytes: %10llu  "
@@ -456,7 +428,7 @@ update_avg(struct pf_altq_node *a)
 	u_int64_t		 b, p;
 	int			 n;
 
-	if (a->altq.qid == 0 && a->altq.scheduler != ALTQT_CODEL)
+	if (a->altq.qid == 0)
 		return;
 
 	qs = &a->qstats;
@@ -479,10 +451,6 @@ update_avg(struct pf_altq_node *a)
 		b = qs->data.fairq_stats.xmit_cnt.bytes;
 		p = qs->data.fairq_stats.xmit_cnt.packets;
 		break;
-	case ALTQT_CODEL:
-		b = qs->data.codel_stats.cl_xmitcnt.bytes;
-		p = qs->data.codel_stats.cl_xmitcnt.packets;
-		break;
 	default:
 		b = 0;
 		p = 0;