Merge branch 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild

[linux-2.6-block.git] / net / sched / Kconfig

diff --git a/net/sched/Kconfig b/net/sched/Kconfig
index c54c9d9d1ffb814e7f4ead7e1db3dbf6c4a9adb7..2274e723a3df6fdf393543281cd56bcb6284b41c 100644 (file)
--- a/net/sched/Kconfig
+++ b/net/sched/Kconfig
@@ -348,7 +348,7 @@ config NET_SCH_PLUG
 comment "Classification"
 
 config NET_CLS
-       boolean
+       bool
 
 config NET_CLS_BASIC
        tristate "Elementary classification (BASIC)"
@@ -698,6 +698,30 @@ config NET_ACT_VLAN
          To compile this code as a module, choose M here: the
          module will be called act_vlan.
 
+config NET_ACT_BPF
+        tristate "BPF based action"
+        depends on NET_CLS_ACT
+        ---help---
+         Say Y here to execute BPF code on packets. The BPF code will decide
+         if the packet should be dropped or not.
+
+         If unsure, say N.
+
+         To compile this code as a module, choose M here: the
+         module will be called act_bpf.
+
+config NET_ACT_CONNMARK
+        tristate "Netfilter Connection Mark Retriever"
+        depends on NET_CLS_ACT && NETFILTER && IP_NF_IPTABLES
+        depends on NF_CONNTRACK && NF_CONNTRACK_MARK
+        ---help---
+         Say Y here to allow retrieving of conn mark
+
+         If unsure, say N.
+
+         To compile this code as a module, choose M here: the
+         module will be called act_connmark.
+
 config NET_CLS_IND
        bool "Incoming device classification"
        depends on NET_CLS_U32 || NET_CLS_FW