Merge tag 'gpio-v4.5-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux...

[deliverable/linux.git] / net / sched / Kconfig

diff --git a/net/sched/Kconfig b/net/sched/Kconfig
index daa33432b7166e1c9af818835441be1b102d8d73..82830824fb1f26e5c7507e952c5b214fce79ea7b 100644 (file)
--- a/net/sched/Kconfig
+++ b/net/sched/Kconfig
@@ -310,15 +310,21 @@ config NET_SCH_PIE
          If unsure, say N.
 
 config NET_SCH_INGRESS
-       tristate "Ingress Qdisc"
+       tristate "Ingress/classifier-action Qdisc"
        depends on NET_CLS_ACT
        select NET_INGRESS
+       select NET_EGRESS
        ---help---
-         Say Y here if you want to use classifiers for incoming packets.
+         Say Y here if you want to use classifiers for incoming and/or outgoing
+         packets. This qdisc doesn't do anything else besides running classifiers,
+         which can also have actions attached to them. In case of outgoing packets,
+         classifiers that this qdisc holds are executed in the transmit path
+         before real enqueuing to an egress qdisc happens.
+
          If unsure, say Y.
 
-         To compile this code as a module, choose M here: the
-         module will be called sch_ingress.
+         To compile this code as a module, choose M here: the module will be
+         called sch_ingress with alias of sch_clsact.
 
 config NET_SCH_PLUG
        tristate "Plug network traffic until release (PLUG)"