upgrade to linux 2.6.10-1.12_FC2

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

diff --git a/net/sched/Kconfig b/net/sched/Kconfig
index c0df054..2fe4fd4 100644 (file)
--- a/net/sched/Kconfig
+++ b/net/sched/Kconfig
@@ -391,11 +391,32 @@ config NET_ACT_GACT
         tristate "generic Actions"
         depends on NET_CLS_ACT
         ---help---
-        You must have new iproute2 to use this feature
-        This adds simple filtering actions like drop,accepet etc 
-                                                                                
+        You must have new iproute2 to use this feature.
+        This adds simple filtering actions like drop, accept etc.
+
 config GACT_PROB
         bool "generic Actions probability"
         depends on NET_ACT_GACT
         ---help---
-        Allows generic actions to be randomly  or deterministically used
+        Allows generic actions to be randomly or deterministically used.
+
+config NET_ACT_MIRRED
+        tristate "Packet In/Egress redirecton/mirror Actions"
+        depends on NET_CLS_ACT
+        ---help---
+        requires new iproute2
+        This allows packets to be mirrored or redirected to netdevices
+
+config NET_ACT_IPT
+        tristate "iptables Actions"
+        depends on NET_CLS_ACT && NETFILTER && IP_NF_IPTABLES
+        ---help---
+        requires new iproute2
+        This allows iptables targets to be used by tc filters
+
+config NET_ACT_PEDIT
+        tristate "Generic Packet Editor Actions"
+        depends on NET_CLS_ACT
+        ---help---
+        requires new iproute2
+        This allows for packets to be generically edited