[src/netbsd-2-0]: src/sys/arch/sbmips/conf Pull up revision 1.27 (requested b...

[jdc <jdc%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/2d45be5c2e8b
branches:  netbsd-2-0
changeset: 561701:2d45be5c2e8b
user:      jdc <jdc%NetBSD.org@localhost>
date:      Wed Jun 30 21:22:55 2004 +0000

description:
Pull up revision 1.27 (requested by abs in ticket #567).

Add (commented out) ALTQ options to all GENERIC-like files

diffstat:

 sys/arch/sbmips/conf/GENERIC |  17 +++++++++++++++--
 1 files changed, 15 insertions(+), 2 deletions(-)

diffs (36 lines):

diff -r c5320085dee6 -r 2d45be5c2e8b sys/arch/sbmips/conf/GENERIC
--- a/sys/arch/sbmips/conf/GENERIC      Wed Jun 30 21:22:21 2004 +0000
+++ b/sys/arch/sbmips/conf/GENERIC      Wed Jun 30 21:22:55 2004 +0000
@@ -1,10 +1,10 @@
-# $NetBSD: GENERIC,v 1.23 2003/10/25 15:05:00 simonb Exp $
+# $NetBSD: GENERIC,v 1.23.2.1 2004/06/30 21:22:55 jdc Exp $
 
 include        "arch/sbmips/conf/std.sbmips"
 
 options        INCLUDE_CONFIG_FILE     # embed config file in kernel binary
 
-#ident                 "GENERIC-$Revision: 1.23 $"
+#ident                 "GENERIC-$Revision: 1.23.2.1 $"
 
 #options       LOCKDEBUG       # XXX XXX XXX XXX
 options        DEBUG           # extra kernel debugging support
@@ -94,6 +94,19 @@
 options        IPFILTER_LOG    # ipmon(8) log support
 #options       IPFILTER_DEFAULT_BLOCK  # block all packets by default
 
+#options       ALTQ            # Manipulate network interfaces' output queues
+#options       ALTQ_BLUE       # Stochastic Fair Blue
+#options       ALTQ_CBQ        # Class-Based Queueing
+#options       ALTQ_CDNR       # Diffserv Traffic Conditioner
+#options       ALTQ_FIFOQ      # First-In First-Out Queue
+#options       ALTQ_FLOWVALVE  # RED/flow-valve (red-penalty-box)
+#options       ALTQ_HFSC       # Hierarchical Fair Service Curve
+#options       ALTQ_LOCALQ     # Local queueing discipline
+#options       ALTQ_PRIQ       # Priority Queueing
+#options       ALTQ_RED        # Random Early Detection
+#options       ALTQ_RIO        # RED with IN/OUT
+#options       ALTQ_WFQ        # Weighted Fair Queueing
+
 # Compatibility with 4.2BSD implementation of TCP/IP.  Not recommended.
 #options       TCP_COMPAT_42