Merge watchdog driver updates

[linux-2.6] / net / sched / Kconfig

diff --git a/net/sched/Kconfig b/net/sched/Kconfig
index 9c118baed9dc5e4ad3c0570da725ee4be6d51fca..45d3bc0812c8b270ea95e7a6c21799d6ec42273b 100644 (file)
--- a/net/sched/Kconfig
+++ b/net/sched/Kconfig
@@ -1,6 +1,43 @@
 #
 # Traffic control configuration.
 # 
+
+menuconfig NET_SCHED
+       bool "QoS and/or fair queueing"
+       ---help---
+         When the kernel has several packets to send out over a network
+         device, it has to decide which ones to send first, which ones to
+         delay, and which ones to drop. This is the job of the packet
+         scheduler, and several different algorithms for how to do this
+         "fairly" have been proposed.
+
+         If you say N here, you will get the standard packet scheduler, which
+         is a FIFO (first come, first served). If you say Y here, you will be
+         able to choose from among several alternative algorithms which can
+         then be attached to different network devices. This is useful for
+         example if some of your network devices are real time devices that
+         need a certain minimum data flow rate, or if you need to limit the
+         maximum data flow rate for traffic which matches specified criteria.
+         This code is considered to be experimental.
+
+         To administer these schedulers, you'll need the user-level utilities
+         from the package iproute2+tc at <ftp://ftp.tux.org/pub/net/ip-routing/>.
+         That package also contains some documentation; for more, check out
+         <http://snafu.freedom.org/linux2.2/iproute-notes.html>.
+
+         This Quality of Service (QoS) support will enable you to use
+         Differentiated Services (diffserv) and Resource Reservation Protocol
+         (RSVP) on your Linux router if you also say Y to "QoS support",
+         "Packet classifier API" and to some classifiers below. Documentation
+         and software is at <http://diffserv.sourceforge.net/>.
+
+         If you say Y here and to "/proc file system" below, you will be able
+         to read status information about packet schedulers from the file
+         /proc/net/psched.
+
+         The available schedulers are listed in the following questions; you
+         can say Y to as many as you like. If unsure, say N now.
+
 choice
        prompt "Packet scheduler clock source"
        depends on NET_SCHED
@@ -185,7 +222,7 @@ config NET_SCH_GRED
        depends on NET_SCHED
        help
          Say Y here if you want to use the Generic Random Early Detection
-         (RED) packet scheduling algorithm for some of your network devices
+         (GRED) packet scheduling algorithm for some of your network devices
          (see the top of <file:net/sched/sch_red.c> for details and
          references about the algorithm).
 
@@ -405,7 +442,7 @@ config NET_EMATCH_STACK
        ---help---
          Size of the local stack variable used while evaluating the tree of
          ematches. Limits the depth of the tree, i.e. the number of
-         encapsulated precedences. Every level requires 4 bytes of addtional
+         encapsulated precedences. Every level requires 4 bytes of additional
          stack space.
 
 config NET_EMATCH_CMP
@@ -449,6 +486,20 @@ config NET_EMATCH_META
          To compile this code as a module, choose M here: the
          module will be called em_meta.
 
+config NET_EMATCH_TEXT
+       tristate "Textsearch"
+       depends on NET_EMATCH
+       select TEXTSEARCH
+       select TEXTSEARCH_KMP
+       select TEXTSEARCH_BM
+       select TEXTSEARCH_FSM
+       ---help---
+         Say Y here if you want to be ablt to classify packets based on
+         textsearch comparisons.
+
+         To compile this code as a module, choose M here: the
+         module will be called em_text.
+
 config NET_CLS_ACT
        bool "Packet ACTION"
        depends on EXPERIMENTAL && NET_CLS && NET_QOS