Merge git://git.infradead.org/users/willy/linux-nvme

[karo-tx-linux.git] / net / netfilter / Kconfig

diff --git a/net/netfilter/Kconfig b/net/netfilter/Kconfig
index 209c1ed43368ed4460c865541aa3cb149963710e..c19b214ffd571776434c2400eb1d906fc35d2589 100644 (file)
--- a/net/netfilter/Kconfig
+++ b/net/netfilter/Kconfig
@@ -335,6 +335,27 @@ config NF_CT_NETLINK_TIMEOUT
 
          If unsure, say `N'.
 
+config NF_CT_NETLINK_HELPER
+       tristate 'Connection tracking helpers in user-space via Netlink'
+       select NETFILTER_NETLINK
+       depends on NF_CT_NETLINK
+       depends on NETFILTER_NETLINK_QUEUE
+       depends on NETFILTER_NETLINK_QUEUE_CT
+       depends on NETFILTER_ADVANCED
+       help
+         This option enables the user-space connection tracking helpers
+         infrastructure.
+
+         If unsure, say `N'.
+
+config NETFILTER_NETLINK_QUEUE_CT
+        bool "NFQUEUE integration with Connection Tracking"
+        default n
+        depends on NETFILTER_NETLINK_QUEUE
+       help
+         If this option is enabled, NFQUEUE can include Connection Tracking
+         information together with the packet is the enqueued via NFNETLINK.
+
 endif # NF_CONNTRACK
 
 # transparent proxy support