summaryrefslogtreecommitdiff
path: root/sys/altq/altq_rmclass.c
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2001-08-09 14:33:00 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2001-08-09 14:33:00 +0000
commit136873ca9383ddf28b4811726bedd929e974b157 (patch)
tree9b71eb8556de0fc1b6edc61d5947a007076fa222 /sys/altq/altq_rmclass.c
parent91614215ff85e9165f2e201ca0a0b3bba8c47d40 (diff)
change a maze of altq options into just "altq" for the base+red+cbq, and
then altq_* for each of the other * experimental options. and.. enable it by default in GENERIC.
Diffstat (limited to 'sys/altq/altq_rmclass.c')
-rw-r--r--sys/altq/altq_rmclass.c17
1 files changed, 1 insertions, 16 deletions
diff --git a/sys/altq/altq_rmclass.c b/sys/altq/altq_rmclass.c
index ba5385eba6e..5435267d574 100644
--- a/sys/altq/altq_rmclass.c
+++ b/sys/altq/altq_rmclass.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: altq_rmclass.c,v 1.1 2001/06/27 05:28:36 kjc Exp $ */
+/* $OpenBSD: altq_rmclass.c,v 1.2 2001/08/09 14:32:59 deraadt Exp $ */
/* $KAME: altq_rmclass.c,v 1.10 2001/02/09 07:20:40 kjc Exp $ */
/*
@@ -37,19 +37,6 @@
* For questions and/or comments, please send mail to cbq@ee.lbl.gov
*/
-#ident "@(#)rm_class.c 1.48 97/12/05 SMI"
-
-#if defined(__FreeBSD__) || defined(__NetBSD__)
-#include "opt_altq.h"
-#if (__FreeBSD__ != 2)
-#include "opt_inet.h"
-#ifdef __FreeBSD__
-#include "opt_inet6.h"
-#endif
-#endif
-#endif /* __FreeBSD__ || __NetBSD__ */
-#ifdef ALTQ_CBQ /* cbq is enabled by ALTQ_CBQ option in opt_altq.h */
-
#include <sys/param.h>
#include <sys/malloc.h>
#include <sys/mbuf.h>
@@ -1745,8 +1732,6 @@ void cbqtrace_dump(counter)
}
#endif /* CBQ_TRACE */
-#endif /* ALTQ_CBQ */
-
#if defined(ALTQ_CBQ) || defined(ALTQ_RED) || defined(ALTQ_RIO) || defined(ALTQ_HFSC) || defined(ALTQ_PRIQ)
#if !defined(__GNUC__) || defined(ALTQ_DEBUG)