Merge branch 'for-2.6.28' of git://linux-nfs.org/~bfields/linux

[linux-2.6-omap-h63xx.git] / net / sched / Kconfig

diff --git a/net/sched/Kconfig b/net/sched/Kconfig
index 9437b27ff84de101b88b3cbe08675f002e562238..6767e54155dbac238f8ea1707272bd95253a4927 100644 (file)
--- a/net/sched/Kconfig
+++ b/net/sched/Kconfig
@@ -106,6 +106,15 @@ config NET_SCH_PRIO
          To compile this code as a module, choose M here: the
          module will be called sch_prio.
 
+config NET_SCH_MULTIQ
+       tristate "Hardware Multiqueue-aware Multi Band Queuing (MULTIQ)"
+       ---help---
+         Say Y here if you want to use an n-band queue packet scheduler
+         to support devices that have multiple hardware transmit queues.
+
+         To compile this code as a module, choose M here: the
+         module will be called sch_multiq.
+
 config NET_SCH_RED
        tristate "Random Early Detection (RED)"
        ---help---
@@ -476,6 +485,17 @@ config NET_ACT_SIMP
          To compile this code as a module, choose M here: the
          module will be called simple.
 
+config NET_ACT_SKBEDIT
+        tristate "SKB Editing"
+        depends on NET_CLS_ACT
+        ---help---
+         Say Y here to change skb priority or queue_mapping settings.
+
+         If unsure, say N.
+
+         To compile this code as a module, choose M here: the
+         module will be called skbedit.
+
 config NET_CLS_IND
        bool "Incoming device classification"
        depends on NET_CLS_U32 || NET_CLS_FW