- Updated to 3.4-rc1.

[linux-flexiantxendom0-3.2.10.git] / net / netfilter / Kconfig

diff --git a/net/netfilter/Kconfig b/net/netfilter/Kconfig
index 8f68101..57080f2 100644 (file)
--- a/net/netfilter/Kconfig
+++ b/net/netfilter/Kconfig
@@ -103,6 +103,16 @@ config NF_CONNTRACK_EVENTS
 
          If unsure, say `N'.
 
+config NF_CONNTRACK_TIMEOUT
+       bool  'Connection tracking timeout'
+       depends on NETFILTER_ADVANCED
+       help
+         This option enables support for connection tracking timeout
+         extension. This allows you to attach timeout policies to flow
+         via the CT target.
+
+         If unsure, say `N'.
+
 config NF_CONNTRACK_TIMESTAMP
        bool  'Connection tracking timestamping'
        depends on NETFILTER_ADVANCED
@@ -329,6 +339,17 @@ config NF_CT_NETLINK
        help
          This option enables support for a netlink-based userspace interface
 
+config NF_CT_NETLINK_TIMEOUT
+       tristate  'Connection tracking timeout tuning via Netlink'
+       select NETFILTER_NETLINK
+       depends on NETFILTER_ADVANCED
+       help
+         This option enables support for connection tracking timeout
+         fine-grain tuning. This allows you to attach specific timeout
+         policies to flows, instead of using the global timeout policy.
+
+         If unsure, say `N'.
+
 endif # NF_CONNTRACK
 
 # transparent proxy support
@@ -539,6 +560,15 @@ config NETFILTER_XT_TARGET_LED
          For more information on the LEDs available on your system, see
          Documentation/leds/leds-class.txt
 
+config NETFILTER_XT_TARGET_LOG
+       tristate "LOG target support"
+       default m if NETFILTER_ADVANCED=n
+       help
+         This option adds a `LOG' target, which allows you to create rules in
+         any iptables table which records the packet header to the syslog.
+
+         To compile it as a module, choose M here.  If unsure, say N.
+
 config NETFILTER_XT_TARGET_MARK
        tristate '"MARK" target support'
        depends on NETFILTER_ADVANCED