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

[karo-tx-linux.git] / net / sched / Kconfig

diff --git a/net/sched/Kconfig b/net/sched/Kconfig
index 2274e723a3df6fdf393543281cd56bcb6284b41c..daa33432b7166e1c9af818835441be1b102d8d73 100644 (file)
--- a/net/sched/Kconfig
+++ b/net/sched/Kconfig
@@ -312,6 +312,7 @@ config NET_SCH_PIE
 config NET_SCH_INGRESS
        tristate "Ingress Qdisc"
        depends on NET_CLS_ACT
+       select NET_INGRESS
        ---help---
          Say Y here if you want to use classifiers for incoming packets.
          If unsure, say Y.
@@ -477,6 +478,16 @@ config NET_CLS_BPF
          To compile this code as a module, choose M here: the module will
          be called cls_bpf.
 
+config NET_CLS_FLOWER
+       tristate "Flower classifier"
+       select NET_CLS
+       ---help---
+         If you say Y here, you will be able to classify packets based on
+         a configurable combination of packet keys and masks.
+
+         To compile this code as a module, choose M here: the module will
+         be called cls_flower.
+
 config NET_EMATCH
        bool "Extended Matches"
        select NET_CLS