Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma

[linux.git] / net / sched / Kconfig

diff --git a/net/sched/Kconfig b/net/sched/Kconfig
index 2985509147a228e95e8cc3cc07e3b64920a50b7c..edde0e5194385a8e2ac5504d9f3ac9720ddcf1e8 100644 (file)
--- a/net/sched/Kconfig
+++ b/net/sched/Kconfig
@@ -366,6 +366,19 @@ config NET_SCH_PIE
 
          If unsure, say N.
 
+config NET_SCH_FQ_PIE
+       depends on NET_SCH_PIE
+       tristate "Flow Queue Proportional Integral controller Enhanced (FQ-PIE)"
+       help
+         Say Y here if you want to use the Flow Queue Proportional Integral
+         controller Enhanced (FQ-PIE) packet scheduling algorithm.
+         For more information, please see https://tools.ietf.org/html/rfc8033
+
+         To compile this driver as a module, choose M here: the module
+         will be called sch_fq_pie.
+
+         If unsure, say N.
+
 config NET_SCH_INGRESS
        tristate "Ingress/classifier-action Qdisc"
        depends on NET_CLS_ACT
@@ -409,6 +422,23 @@ config NET_SCH_PLUG
          To compile this code as a module, choose M here: the
          module will be called sch_plug.
 
+config NET_SCH_ETS
+       tristate "Enhanced transmission selection scheduler (ETS)"
+       help
+          The Enhanced Transmission Selection scheduler is a classful
+          queuing discipline that merges functionality of PRIO and DRR
+          qdiscs in one scheduler. ETS makes it easy to configure a set of
+          strict and bandwidth-sharing bands to implement the transmission
+          selection described in 802.1Qaz.
+
+         Say Y here if you want to use the ETS packet scheduling
+         algorithm.
+
+         To compile this driver as a module, choose M here: the module
+         will be called sch_ets.
+
+         If unsure, say N.
+
 menuconfig NET_SCH_DEFAULT
        bool "Allow override default queue discipline"
        ---help---