From 01cc78bd7b031b6c90ce5b1970a773c8cafe9303 Mon Sep 17 00:00:00 2001
From: Henning Brauer <henning@cvs.openbsd.org>
Date: Wed, 2 Apr 2003 14:51:46 +0000
Subject: remove what is left over from the control class stuff

ok kjc@
---
 sys/altq/altq_cbq.c | 20 ++------------------
 sys/altq/altq_cbq.h |  4 +---
 2 files changed, 3 insertions(+), 21 deletions(-)

diff --git a/sys/altq/altq_cbq.c b/sys/altq/altq_cbq.c
index a61dfd36ca8..77ffe4cdc60 100644
--- a/sys/altq/altq_cbq.c
+++ b/sys/altq/altq_cbq.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: altq_cbq.c,v 1.15 2003/03/31 12:35:45 henning Exp $	*/
+/*	$OpenBSD: altq_cbq.c,v 1.16 2003/04/02 14:51:45 henning Exp $	*/
 /*	$KAME: altq_cbq.c,v 1.9 2000/12/14 08:12:45 thorpej Exp $	*/
 
 /*
@@ -86,9 +86,6 @@ cbq_class_destroy(cbq_state_t *cbqp, struct rm_class *cl)
 	case DEFAULT_CLASS_HANDLE:
 		cbqp->ifnp.default_ = NULL;
 		break;
-	case CTL_CLASS_HANDLE:
-		cbqp->ifnp.ctl_ = NULL;
-		break;
 	case NULL_CLASS_HANDLE:
 		break;
 	default:
@@ -111,8 +108,6 @@ clh_to_clp(cbq_state_t *cbqp, u_int32_t chandle)
 		return (cbqp->ifnp.root_);
 	case DEFAULT_CLASS_HANDLE:
 		return (cbqp->ifnp.default_);
-	case CTL_CLASS_HANDLE:
-		return (cbqp->ifnp.ctl_);
 	}
 
 	if (chandle >= CBQ_MAX_CLASSES)
@@ -140,11 +135,6 @@ cbq_clear_interface(cbq_state_t *cbqp)
 				}
 			}
 		}
-		if (cbqp->ifnp.ctl_ != NULL &&
-		    !is_a_parent_class(cbqp->ifnp.ctl_)) {
-			cbq_class_destroy(cbqp, cbqp->ifnp.ctl_);
-			cbqp->ifnp.ctl_ = NULL;
-		}
 		if (cbqp->ifnp.default_ != NULL &&
 		    !is_a_parent_class(cbqp->ifnp.default_)) {
 			cbq_class_destroy(cbqp, cbqp->ifnp.default_);
@@ -258,8 +248,6 @@ cbq_remove_altq(struct pf_altq *a)
 
 	cbq_clear_interface(cbqp);
 
-	if (cbqp->ifnp.ctl_)
-		cbq_class_destroy(cbqp, cbqp->ifnp.ctl_);
 	if (cbqp->ifnp.default_)
 		cbq_class_destroy(cbqp, cbqp->ifnp.default_);
 	if (cbqp->ifnp.root_)
@@ -328,8 +316,7 @@ cbq_add_queue(struct pf_altq *a)
 		if (a->qid == 0)
 			return (EINVAL);
 		if (a->qid >= CBQ_MAX_CLASSES &&
-		    a->qid != DEFAULT_CLASS_HANDLE &&
-		    a->qid != CTL_CLASS_HANDLE)
+		    a->qid != DEFAULT_CLASS_HANDLE)
 			return (EINVAL);
 		if (cbqp->cbq_class_tbl[a->qid] != NULL)
 			return (EBUSY);
@@ -407,9 +394,6 @@ cbq_remove_queue(struct pf_altq *a)
 	case DEFAULT_CLASS_HANDLE:
 		cbqp->ifnp.default_ = NULL;
 		break;
-	case CTL_CLASS_HANDLE:
-		cbqp->ifnp.ctl_ = NULL;
-		break;
 	case NULL_CLASS_HANDLE:
 		break;
 	default:
diff --git a/sys/altq/altq_cbq.h b/sys/altq/altq_cbq.h
index b6d59d2d202..f56ad5378a6 100644
--- a/sys/altq/altq_cbq.h
+++ b/sys/altq/altq_cbq.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: altq_cbq.h,v 1.6 2002/12/16 17:27:19 henning Exp $	*/
+/*	$OpenBSD: altq_cbq.h,v 1.7 2003/04/02 14:51:45 henning Exp $	*/
 /*	$KAME: altq_cbq.h,v 1.5 2000/12/02 13:44:40 kjc Exp $	*/
 
 /*
@@ -49,7 +49,6 @@ extern "C" {
 #define	NULL_CLASS_HANDLE	0xffffffff
 #define	ROOT_CLASS_HANDLE	0xfffffffe
 #define	DEFAULT_CLASS_HANDLE	0xfffffffd
-#define	CTL_CLASS_HANDLE	0xfffffffc
 
 /* class flags shoud be same as class flags in rm_class.h */
 #define	CBQCLF_RED		0x0001	/* use RED */
@@ -66,7 +65,6 @@ extern "C" {
 /* class flags for special classes */
 #define	CBQCLF_ROOTCLASS	0x1000	/* root class */
 #define	CBQCLF_DEFCLASS		0x2000	/* default class */
-#define	CBQCLF_CTLCLASS		0x4000	/* control class */
 #define	CBQCLF_CLASSMASK	0xf000	/* class mask */
 
 #define	CBQ_MAXQSIZE		200
-- 
cgit v1.2.3