Merge tag 'pm+acpi-3.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael...

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

diff --git a/net/netfilter/Kconfig b/net/netfilter/Kconfig
index b5c1d3aadb41569d95728d9eca5faf6831caa9dc..ae5096ab65eb54cff350f8a19e981b6d8906b16e 100644 (file)
--- a/net/netfilter/Kconfig
+++ b/net/netfilter/Kconfig
@@ -496,6 +496,15 @@ config NFT_LIMIT
          This option adds the "limit" expression that you can use to
          ratelimit rule matchings.
 
+config NFT_MASQ
+       depends on NF_TABLES
+       depends on NF_CONNTRACK
+       depends on NF_NAT
+       tristate "Netfilter nf_tables masquerade support"
+       help
+         This option adds the "masquerade" expression that you can use
+         to perform NAT in the masquerade flavour.
+
 config NFT_NAT
        depends on NF_TABLES
        depends on NF_CONNTRACK
@@ -847,6 +856,7 @@ config NETFILTER_XT_TARGET_TPROXY
        tristate '"TPROXY" target transparent proxying support'
        depends on NETFILTER_XTABLES
        depends on NETFILTER_ADVANCED
+       depends on (IPV6 || IPV6=n)
        depends on IP_NF_MANGLE
        select NF_DEFRAG_IPV4
        select NF_DEFRAG_IPV6 if IP6_NF_IPTABLES