Merge tag 'scsi-sg' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi

[linux.git] / net / sched / Kconfig

diff --git a/net/sched/Kconfig b/net/sched/Kconfig
index 2c72d95c3050636a1071d8778382b6b1e97b5c6d..dd55b9ac3a661b42c0071a69650c14e503da2ca6 100644 (file)
--- a/net/sched/Kconfig
+++ b/net/sched/Kconfig
@@ -842,6 +842,17 @@ config NET_ACT_CSUM
          To compile this code as a module, choose M here: the
          module will be called act_csum.
 
+config NET_ACT_MPLS
+       tristate "MPLS manipulation"
+       depends on NET_CLS_ACT
+       help
+         Say Y here to push or pop MPLS headers.
+
+         If unsure, say N.
+
+         To compile this code as a module, choose M here: the
+         module will be called act_mpls.
+
 config NET_ACT_VLAN
         tristate "Vlan manipulation"
         depends on NET_CLS_ACT
@@ -877,6 +888,23 @@ config NET_ACT_CONNMARK
          To compile this code as a module, choose M here: the
          module will be called act_connmark.
 
+config NET_ACT_CTINFO
+        tristate "Netfilter Connection Mark Actions"
+        depends on NET_CLS_ACT && NETFILTER && IP_NF_IPTABLES
+        depends on NF_CONNTRACK && NF_CONNTRACK_MARK
+        help
+         Say Y here to allow transfer of a connmark stored information.
+         Current actions transfer connmark stored DSCP into
+         ipv4/v6 diffserv and/or to transfer connmark to packet
+         mark.  Both are useful for restoring egress based marks
+         back onto ingress connections for qdisc priority mapping
+         purposes.
+
+         If unsure, say N.
+
+         To compile this code as a module, choose M here: the
+         module will be called act_ctinfo.
+
 config NET_ACT_SKBMOD
         tristate "skb data modification action"
         depends on NET_CLS_ACT
@@ -912,6 +940,17 @@ config NET_ACT_TUNNEL_KEY
          To compile this code as a module, choose M here: the
          module will be called act_tunnel_key.
 
+config NET_ACT_CT
+        tristate "connection tracking tc action"
+        depends on NET_CLS_ACT && NF_CONNTRACK
+        help
+         Say Y here to allow sending the packets to conntrack module.
+
+         If unsure, say N.
+
+         To compile this code as a module, choose M here: the
+         module will be called act_ct.
+
 config NET_IFE_SKBMARK
         tristate "Support to encoding decoding skb mark on IFE action"
         depends on NET_ACT_IFE
@@ -924,14 +963,6 @@ config NET_IFE_SKBTCINDEX
         tristate "Support to encoding decoding skb tcindex on IFE action"
         depends on NET_ACT_IFE
 
-config NET_CLS_IND
-       bool "Incoming device classification"
-       depends on NET_CLS_U32 || NET_CLS_FW
-       ---help---
-         Say Y here to extend the u32 and fw classifier to support
-         classification based on the incoming device. This option is
-         likely to disappear in favour of the metadata ematch.
-
 endif # NET_SCHED
 
 config NET_SCH_FIFO