Merge branch 'x86-kbuild-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[mv-sheeva.git] / net / sched / Kconfig

diff --git a/net/sched/Kconfig b/net/sched/Kconfig
index 6767e54155dbac238f8ea1707272bd95253a4927..929218a4762060ee2052370eb70fe955c418211a 100644 (file)
--- a/net/sched/Kconfig
+++ b/net/sched/Kconfig
@@ -194,6 +194,17 @@ config NET_SCH_NETEM
 
          If unsure, say N.
 
+config NET_SCH_DRR
+       tristate "Deficit Round Robin scheduler (DRR)"
+       help
+         Say Y here if you want to use the Deficit Round Robin (DRR) packet
+         scheduling algorithm.
+
+         To compile this driver as a module, choose M here: the module
+         will be called sch_drr.
+
+         If unsure, say N.
+
 config NET_SCH_INGRESS
        tristate "Ingress Qdisc"
        depends on NET_CLS_ACT
@@ -316,6 +327,14 @@ config NET_CLS_FLOW
          To compile this code as a module, choose M here: the
          module will be called cls_flow.
 
+config NET_CLS_CGROUP
+       bool "Control Group Classifier"
+       select NET_CLS
+       depends on CGROUPS
+       ---help---
+         Say Y here if you want to classify packets based on the control
+         cgroup of their process.
+
 config NET_EMATCH
        bool "Extended Matches"
        select NET_CLS