Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211

[~andy/linux] / net / sched / Kconfig

diff --git a/net/sched/Kconfig b/net/sched/Kconfig
index ad1f1d819203698cc5cb483cfc7edbfd15131b9a..a1a8e29e5fc995abdda1fe817ca40e12c85a8ecd 100644 (file)
--- a/net/sched/Kconfig
+++ b/net/sched/Kconfig
@@ -286,6 +286,28 @@ config NET_SCH_FQ
 
          If unsure, say N.
 
+config NET_SCH_HHF
+       tristate "Heavy-Hitter Filter (HHF)"
+       help
+         Say Y here if you want to use the Heavy-Hitter Filter (HHF)
+         packet scheduling algorithm.
+
+         To compile this driver as a module, choose M here: the module
+         will be called sch_hhf.
+
+config NET_SCH_PIE
+       tristate "Proportional Integral controller Enhanced (PIE) scheduler"
+       help
+         Say Y here if you want to use the Proportional Integral controller
+         Enhanced scheduler packet scheduling algorithm.
+         For more information, please see
+         http://tools.ietf.org/html/draft-pan-tsvwg-pie-00
+
+         To compile this driver as a module, choose M here: the module
+         will be called sch_pie.
+
+         If unsure, say N.
+
 config NET_SCH_INGRESS
        tristate "Ingress Qdisc"
        depends on NET_CLS_ACT
@@ -435,6 +457,7 @@ config NET_CLS_FLOW
 config NET_CLS_CGROUP
        tristate "Control Group Classifier"
        select NET_CLS
+       select CGROUP_NET_CLASSID
        depends on CGROUPS
        ---help---
          Say Y here if you want to classify packets based on the control