summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorderaadt <deraadt@openbsd.org>2001-08-09 14:32:59 +0000
committerderaadt <deraadt@openbsd.org>2001-08-09 14:32:59 +0000
commit14dccbfc241db5ab3d39492e9805c540e47cc00f (patch)
tree86db0353a8b95a0affc7054aecbca7978f39d3dd
parentCorrect linux-compat sigaltstack implementation. (diff)
downloadwireguard-openbsd-14dccbfc241db5ab3d39492e9805c540e47cc00f.tar.xz
wireguard-openbsd-14dccbfc241db5ab3d39492e9805c540e47cc00f.zip
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.
-rw-r--r--sys/altq/altq.h5
-rw-r--r--sys/altq/altq_afmap.c14
-rw-r--r--sys/altq/altq_blue.c15
-rw-r--r--sys/altq/altq_cbq.c17
-rw-r--r--sys/altq/altq_cdnr.c17
-rw-r--r--sys/altq/altq_conf.c12
-rw-r--r--sys/altq/altq_fifoq.c9
-rw-r--r--sys/altq/altq_hfsc.c16
-rw-r--r--sys/altq/altq_localq.c10
-rw-r--r--sys/altq/altq_priq.c16
-rw-r--r--sys/altq/altq_red.c15
-rw-r--r--sys/altq/altq_rio.c15
-rw-r--r--sys/altq/altq_rmclass.c17
-rw-r--r--sys/altq/altq_subr.c15
-rw-r--r--sys/altq/altq_wfq.c15
-rw-r--r--sys/conf/GENERIC3
-rw-r--r--sys/conf/files24
17 files changed, 32 insertions, 203 deletions
diff --git a/sys/altq/altq.h b/sys/altq/altq.h
index 8f1295a7935..714a3af1fd6 100644
--- a/sys/altq/altq.h
+++ b/sys/altq/altq.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: altq.h,v 1.1 2001/06/27 05:28:34 kjc Exp $ */
+/* $OpenBSD: altq.h,v 1.2 2001/08/09 14:32:59 deraadt Exp $ */
/* $KAME: altq.h,v 1.6 2000/12/14 08:12:45 thorpej Exp $ */
/*
@@ -34,6 +34,9 @@
#include <sys/queue.h>
#include <netinet/in.h>
+#define ALTQ_RED /* Always included */
+#define ALTQ_CQB /* Always included */
+
#ifndef IFNAMSIZ
#define IFNAMSIZ 16
#endif
diff --git a/sys/altq/altq_afmap.c b/sys/altq/altq_afmap.c
index 0e3a5e1746c..02f266f2b44 100644
--- a/sys/altq/altq_afmap.c
+++ b/sys/altq/altq_afmap.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: altq_afmap.c,v 1.1 2001/06/27 05:28:34 kjc Exp $ */
+/* $OpenBSD: altq_afmap.c,v 1.2 2001/08/09 14:32:59 deraadt Exp $ */
/* $KAME: altq_afmap.c,v 1.7 2000/12/14 08:12:45 thorpej Exp $ */
/*
@@ -34,16 +34,6 @@
* flowinfo mechanism. it's just put in the altq framework since
* it is easy to add devices to altq.
*/
-#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_AFMAP
#include <sys/types.h>
#include <sys/param.h>
@@ -408,5 +398,3 @@ afmioctl(dev, cmd, addr, flag, p)
return error;
}
-
-#endif /* ALTQ_AFMAP */
diff --git a/sys/altq/altq_blue.c b/sys/altq/altq_blue.c
index 291fe0883b4..0edb34c5baf 100644
--- a/sys/altq/altq_blue.c
+++ b/sys/altq/altq_blue.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: altq_blue.c,v 1.1 2001/06/27 05:28:34 kjc Exp $ */
+/* $OpenBSD: altq_blue.c,v 1.2 2001/08/09 14:32:59 deraadt Exp $ */
/* $KAME: altq_blue.c,v 1.7 2000/12/14 08:12:45 thorpej Exp $ */
/*
@@ -60,17 +60,6 @@
* SUCH DAMAGE.
*/
-#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_BLUE /* blue is enabled by ALTQ_BLUE option in opt_altq.h */
-
#include <sys/param.h>
#include <sys/malloc.h>
#include <sys/mbuf.h>
@@ -687,5 +676,3 @@ static struct altqsw blue_sw =
ALTQ_MODULE(altq_blue, ALTQT_BLUE, &blue_sw);
#endif /* KLD_MODULE */
-
-#endif /* ALTQ_BLUE */
diff --git a/sys/altq/altq_cbq.c b/sys/altq/altq_cbq.c
index 561ecd55be4..180c47e615c 100644
--- a/sys/altq/altq_cbq.c
+++ b/sys/altq/altq_cbq.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: altq_cbq.c,v 1.1 2001/06/27 05:28:34 kjc Exp $ */
+/* $OpenBSD: altq_cbq.c,v 1.2 2001/08/09 14:32:59 deraadt Exp $ */
/* $KAME: altq_cbq.c,v 1.9 2000/12/14 08:12:45 thorpej Exp $ */
/*
@@ -31,19 +31,6 @@
* These notices must be retained in any copies of any part of this software.
*/
-#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 */
-
-/* #pragma ident "@(#)cbq.c 1.39 98/05/13 SMI" */
-
#include <sys/param.h>
#include <sys/malloc.h>
#include <sys/mbuf.h>
@@ -969,5 +956,3 @@ static struct altqsw cbq_sw =
ALTQ_MODULE(altq_cbq, ALTQT_CBQ, &cbq_sw);
#endif /* KLD_MODULE */
-
-#endif /* ALTQ_CBQ */
diff --git a/sys/altq/altq_cdnr.c b/sys/altq/altq_cdnr.c
index 7b6518161ab..8c1cb317b42 100644
--- a/sys/altq/altq_cdnr.c
+++ b/sys/altq/altq_cdnr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: altq_cdnr.c,v 1.1 2001/06/27 05:28:34 kjc Exp $ */
+/* $OpenBSD: altq_cdnr.c,v 1.2 2001/08/09 14:32:59 deraadt Exp $ */
/* $KAME: altq_cdnr.c,v 1.8 2000/12/14 08:12:45 thorpej Exp $ */
/*
@@ -27,16 +27,6 @@
* SUCH DAMAGE.
*/
-#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__ */
-
#include <sys/param.h>
#include <sys/malloc.h>
#include <sys/mbuf.h>
@@ -67,9 +57,6 @@
int altq_cdnr_enabled = 0;
-/* traffic conditioner is enabled by ALTQ_CDNR option in opt_altq.h */
-#ifdef ALTQ_CDNR
-
/* cdnr_list keeps all cdnr's allocated. */
static LIST_HEAD(, top_cdnr) tcb_list;
@@ -1371,5 +1358,3 @@ static struct altqsw cdnr_sw =
ALTQ_MODULE(altq_cdnr, ALTQT_CDNR, &cdnr_sw);
#endif /* KLD_MODULE */
-
-#endif /* ALTQ_CDNR */
diff --git a/sys/altq/altq_conf.c b/sys/altq/altq_conf.c
index 4baac8d2634..9ff133e715b 100644
--- a/sys/altq/altq_conf.c
+++ b/sys/altq/altq_conf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: altq_conf.c,v 1.1 2001/06/27 05:28:35 kjc Exp $ */
+/* $OpenBSD: altq_conf.c,v 1.2 2001/08/09 14:32:59 deraadt Exp $ */
/* $KAME: altq_conf.c,v 1.11 2001/06/21 11:00:36 kjc Exp $ */
/*
@@ -27,16 +27,6 @@
* SUCH DAMAGE.
*/
-#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__ */
-
/*
* altq device interface.
*/
diff --git a/sys/altq/altq_fifoq.c b/sys/altq/altq_fifoq.c
index 16231ce6517..553f0339ebd 100644
--- a/sys/altq/altq_fifoq.c
+++ b/sys/altq/altq_fifoq.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: altq_fifoq.c,v 1.1 2001/06/27 05:28:35 kjc Exp $ */
+/* $OpenBSD: altq_fifoq.c,v 1.2 2001/08/09 14:32:59 deraadt Exp $ */
/* $KAME: altq_fifoq.c,v 1.7 2000/12/14 08:12:45 thorpej Exp $ */
/*
@@ -27,11 +27,6 @@
* SUCH DAMAGE.
*/
-#if defined(__FreeBSD__) || defined(__NetBSD__)
-#include "opt_altq.h"
-#endif /* __FreeBSD__ || __NetBSD__ */
-#ifdef ALTQ_FIFOQ /* fifoq is enabled by ALTQ_FIFOQ option in opt_altq.h */
-
/*
* FIFOQ is an altq sample implementation. There will be little
* need to use FIFOQ as an alternative queueing scheme.
@@ -411,5 +406,3 @@ static struct altqsw fifoq_sw =
ALTQ_MODULE(altq_fifoq, ALTQT_FIFOQ, &fifoq_sw);
#endif /* KLD_MODULE */
-
-#endif /* ALTQ_FIFOQ */
diff --git a/sys/altq/altq_hfsc.c b/sys/altq/altq_hfsc.c
index 280e8e58eef..5f85820cad3 100644
--- a/sys/altq/altq_hfsc.c
+++ b/sys/altq/altq_hfsc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: altq_hfsc.c,v 1.1 2001/06/27 05:28:35 kjc Exp $ */
+/* $OpenBSD: altq_hfsc.c,v 1.2 2001/08/09 14:32:59 deraadt Exp $ */
/* $KAME: altq_hfsc.c,v 1.8 2000/12/14 08:12:46 thorpej Exp $ */
/*
@@ -40,18 +40,6 @@
* by Ion Stoica, Hui Zhang, and T. S. Eugene Ng.
*/
-#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_HFSC /* hfsc is enabled by ALTQ_HFSC option in opt_altq.h */
-
#include <sys/param.h>
#include <sys/malloc.h>
#include <sys/mbuf.h>
@@ -1807,5 +1795,3 @@ static struct altqsw hfsc_sw =
ALTQ_MODULE(altq_hfsc, ALTQT_HFSC, &hfsc_sw);
#endif /* KLD_MODULE */
-
-#endif /* ALTQ_HFSC */
diff --git a/sys/altq/altq_localq.c b/sys/altq/altq_localq.c
index b8d70956dea..bb9a9ee010c 100644
--- a/sys/altq/altq_localq.c
+++ b/sys/altq/altq_localq.c
@@ -1,12 +1,6 @@
-/* $OpenBSD: altq_localq.c,v 1.1 2001/06/27 05:28:35 kjc Exp $ */
+/* $OpenBSD: altq_localq.c,v 1.2 2001/08/09 14:32:59 deraadt Exp $ */
/* $KAME: altq_localq.c,v 1.3 2000/10/18 09:15:23 kjc Exp $ */
-
-#if defined(__FreeBSD__) || defined(__NetBSD__)
-#include "opt_altq.h"
-#endif /* __FreeBSD__ || __NetBSD__ */
-#ifdef ALTQ_LOCALQ /* localq is enabled by ALTQ_LOCALQ option in opt_altq.h */
-
#include <sys/param.h>
#include <sys/mbuf.h>
#include <sys/socket.h>
@@ -65,5 +59,3 @@ static struct altqsw localq_sw =
ALTQ_MODULE(altq_localq, ALTQT_LOCALQ, &localq_sw);
#endif /* KLD_MODULE */
-
-#endif /* ALTQ_LOCALQ */
diff --git a/sys/altq/altq_priq.c b/sys/altq/altq_priq.c
index e3c50441fb2..4b92d06bb26 100644
--- a/sys/altq/altq_priq.c
+++ b/sys/altq/altq_priq.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: altq_priq.c,v 1.1 2001/06/27 05:28:35 kjc Exp $ */
+/* $OpenBSD: altq_priq.c,v 1.2 2001/08/09 14:32:59 deraadt Exp $ */
/* $KAME: altq_priq.c,v 1.1 2000/10/18 09:15:23 kjc Exp $ */
/*
* Copyright (C) 2000
@@ -29,18 +29,6 @@
* priority queue
*/
-#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_PRIQ /* priq is enabled by ALTQ_PRIQ option in opt_altq.h */
-
#include <sys/param.h>
#include <sys/malloc.h>
#include <sys/mbuf.h>
@@ -862,5 +850,3 @@ static struct altqsw priq_sw =
ALTQ_MODULE(altq_priq, ALTQT_PRIQ, &priq_sw);
#endif /* KLD_MODULE */
-
-#endif /* ALTQ_PRIQ */
diff --git a/sys/altq/altq_red.c b/sys/altq/altq_red.c
index 00e3ec8a5f5..0d904c76236 100644
--- a/sys/altq/altq_red.c
+++ b/sys/altq/altq_red.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: altq_red.c,v 1.1 2001/06/27 05:28:36 kjc Exp $ */
+/* $OpenBSD: altq_red.c,v 1.2 2001/08/09 14:32:59 deraadt Exp $ */
/* $KAME: altq_red.c,v 1.8 2000/12/14 08:12:46 thorpej Exp $ */
/*
@@ -60,17 +60,6 @@
* SUCH DAMAGE.
*/
-#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_RED /* red is enabled by ALTQ_RED option in opt_altq.h */
-
#include <sys/param.h>
#include <sys/malloc.h>
#include <sys/mbuf.h>
@@ -1471,5 +1460,3 @@ static struct altqsw red_sw =
ALTQ_MODULE(altq_red, ALTQT_RED, &red_sw);
#endif /* KLD_MODULE */
-
-#endif /* ALTQ_RED */
diff --git a/sys/altq/altq_rio.c b/sys/altq/altq_rio.c
index 37fe1833f09..b9a6d5575d0 100644
--- a/sys/altq/altq_rio.c
+++ b/sys/altq/altq_rio.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: altq_rio.c,v 1.1 2001/06/27 05:28:36 kjc Exp $ */
+/* $OpenBSD: altq_rio.c,v 1.2 2001/08/09 14:32:59 deraadt Exp $ */
/* $KAME: altq_rio.c,v 1.8 2000/12/14 08:12:46 thorpej Exp $ */
/*
@@ -59,17 +59,6 @@
* SUCH DAMAGE.
*/
-#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_RIO /* rio is enabled by ALTQ_RIO option in opt_altq.h */
-
#include <sys/param.h>
#include <sys/malloc.h>
#include <sys/mbuf.h>
@@ -825,5 +814,3 @@ static struct altqsw rio_sw =
ALTQ_MODULE(altq_rio, ALTQT_RIO, &rio_sw);
#endif /* KLD_MODULE */
-
-#endif /* ALTQ_RIO */
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)
diff --git a/sys/altq/altq_subr.c b/sys/altq/altq_subr.c
index dcd64a1f2e5..c1149a3e65a 100644
--- a/sys/altq/altq_subr.c
+++ b/sys/altq/altq_subr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: altq_subr.c,v 1.1 2001/06/27 05:28:36 kjc Exp $ */
+/* $OpenBSD: altq_subr.c,v 1.2 2001/08/09 14:32:59 deraadt Exp $ */
/* $KAME: altq_subr.c,v 1.8 2000/12/14 08:12:46 thorpej Exp $ */
/*
@@ -27,17 +27,6 @@
* SUCH DAMAGE.
*/
-#ifdef ALTQ
-#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__ */
-
#include <sys/param.h>
#include <sys/malloc.h>
#include <sys/mbuf.h>
@@ -1548,5 +1537,3 @@ init_machclk(void)
printf("altq: emulate %uHz cpu clock\n", machclk_freq);
}
#endif /* !i386 && !alpha */
-
-#endif /* ALTQ */
diff --git a/sys/altq/altq_wfq.c b/sys/altq/altq_wfq.c
index e1545d5b694..d319b10e2a1 100644
--- a/sys/altq/altq_wfq.c
+++ b/sys/altq/altq_wfq.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: altq_wfq.c,v 1.1 2001/06/27 05:28:36 kjc Exp $ */
+/* $OpenBSD: altq_wfq.c,v 1.2 2001/08/09 14:32:59 deraadt Exp $ */
/* $KAME: altq_wfq.c,v 1.7 2000/12/14 08:12:46 thorpej Exp $ */
/*
@@ -31,17 +31,6 @@
* (kyu@mt.cs.keio.ac.jp).
*/
-#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_WFQ
-
#include <sys/types.h>
#include <sys/param.h>
#include <sys/malloc.h>
@@ -748,5 +737,3 @@ static struct altqsw wfq_sw =
ALTQ_MODULE(altq_wfq, ALTQT_WFQ, &wfq_sw);
#endif /* KLD_MODULE */
-
-#endif /* ALTQ_WFQ */
diff --git a/sys/conf/GENERIC b/sys/conf/GENERIC
index f6e25056ce8..dfae1f2577e 100644
--- a/sys/conf/GENERIC
+++ b/sys/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.83 2001/08/08 15:15:28 jjbg Exp $
+# $OpenBSD: GENERIC,v 1.84 2001/08/09 14:32:59 deraadt Exp $
#
# Machine-independent option; used by all architectures for their
# GENERIC kernel
@@ -60,6 +60,7 @@ option UNION # union file system
#option GATEWAY # packet forwarding
option INET # IP + ICMP + TCP + UDP
+option ALTQ # ALTQ base
option INET6 # IPv6 (needs INET)
option PULLDOWN_TEST # use m_pulldown for IPv6 packet parsing
option IPSEC # IPsec
diff --git a/sys/conf/files b/sys/conf/files
index 9c553a09e2a..df6579563ad 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -1,4 +1,4 @@
-# $OpenBSD: files,v 1.219 2001/08/08 15:15:28 jjbg Exp $
+# $OpenBSD: files,v 1.220 2001/08/09 14:32:59 deraadt Exp $
# $NetBSD: files,v 1.87 1996/05/19 17:17:50 jonathan Exp $
# @(#)files.newconf 7.5 (Berkeley) 5/10/93
@@ -307,20 +307,20 @@ file adosfs/adlookup.c adosfs
file adosfs/adutil.c adosfs
file adosfs/advfsops.c adosfs
file adosfs/advnops.c adosfs
-file altq/altq_afmap.c altq
-file altq/altq_blue.c altq
-file altq/altq_cbq.c altq
-file altq/altq_cdnr.c altq
file altq/altq_conf.c altq
-file altq/altq_fifoq.c altq
-file altq/altq_hfsc.c altq
-file altq/altq_localq.c altq
-file altq/altq_priq.c altq
+file altq/altq_subr.c altq
file altq/altq_red.c altq
-file altq/altq_rio.c altq
+file altq/altq_cbq.c altq
file altq/altq_rmclass.c altq
-file altq/altq_subr.c altq
-file altq/altq_wfq.c altq
+file altq/altq_afmap.c altq_afmap
+file altq/altq_blue.c altq_blue
+file altq/altq_cdnr.c altq_cdnr
+file altq/altq_fifoq.c altq_fifoq
+file altq/altq_hfsc.c altq_hfsc
+file altq/altq_localq.c altq_localq
+file altq/altq_priq.c altq_priq
+file altq/altq_rio.c altq_rio
+file altq/altq_wfq.c altq_wfq
file ddb/db_access.c ddb | kgdb
file ddb/db_aout.c ddb
file ddb/db_break.c ddb