vserver 1.9.5.x5

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

diff --git a/net/sched/Kconfig b/net/sched/Kconfig
index 97a42d9..b0fb5d7 100644 (file)
--- a/net/sched/Kconfig
+++ b/net/sched/Kconfig
@@ -317,7 +317,7 @@ config NET_CLS_U32
          module will be called cls_u32.
 
 config CLS_U32_PERF
-       bool "     U32 classifier performance counters"
+       bool "U32 classifier performance counters"
        depends on NET_CLS_U32
        help
          gathers stats that could be used to tune u32 classifier performance.
@@ -334,6 +334,18 @@ config NET_CLS_IND
          Requires a new iproute2
          You MUST NOT turn this on if you dont have an update iproute2.
 
+config CLS_U32_MARK
+       bool "Use nfmark as a key in U32 classifier"
+       depends on NET_CLS_U32 && NETFILTER
+       help
+         This allows you to match mark in a u32 filter.
+         Example:
+         tc filter add dev eth0 protocol ip parent 1:0 prio 5 u32 \
+               match mark 0x0090 0xffff \
+               match ip dst 4.4.4.4 \
+               flowid 1:90
+         You must use a new iproute2 to use this feature.
+
 config NET_CLS_RSVP
        tristate "Special RSVP classifier"
        depends on NET_CLS && NET_QOS
@@ -364,25 +376,58 @@ config NET_CLS_RSVP6
          module will be called cls_rsvp6.
 
 config NET_CLS_ACT
-       bool '  Packet ACTION ' 
+       bool "Packet ACTION"
        depends on EXPERIMENTAL && NET_CLS && NET_QOS
        ---help---
        This option requires you have a new iproute2. It enables
        tc extensions which can be used with tc classifiers.
-       Only the u32 and fw classifiers are supported at the moment.
          You MUST NOT turn this on if you dont have an update iproute2.
 
 config NET_ACT_POLICE
-       tristate '      Policing Actions' 
+       tristate "Policing Actions"
         depends on NET_CLS_ACT 
         ---help---
         If you are using a newer iproute2 select this one, otherwise use one
        below to select a policer.
          You MUST NOT turn this on if you dont have an update iproute2.
 
+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, accept etc.
+
+config GACT_PROB
+        bool "generic Actions probability"
+        depends on NET_ACT_GACT
+        ---help---
+        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
+
 config NET_CLS_POLICE
        bool "Traffic policing (needed for in/egress)"
-       depends on NET_CLS && NET_QOS && NET_ACT_POLICE!=y && NET_ACT_POLICE!=m
+       depends on NET_CLS && NET_QOS && NET_CLS_ACT!=y
        help
          Say Y to support traffic policing (bandwidth limits).  Needed for
          ingress and egress rate limiting.