netfilter: masquerading needs to be independent of x_tables in Kconfig

Users are starting to test nf_tables with no x_tables support. Therefore,
masquerading needs to be indenpendent of it from Kconfig.

Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

diff --git a/net/ipv4/netfilter/Kconfig b/net/ipv4/netfilter/Kconfig
index eb6995fc4f673c1cfca56df336ee9c2ae5bc5fb2..345242a79db6906fa8751f23b6c990efa8adb327 100644 (file)
--- a/net/ipv4/netfilter/Kconfig
+++ b/net/ipv4/netfilter/Kconfig
@@ -93,6 +93,21 @@ config NFT_CHAIN_NAT_IPV4
          packet transformations such as the source, destination address and
          source and destination ports.
 
+config NF_NAT_MASQUERADE_IPV4
+       tristate "IPv4 masquerade support"
+       help
+         This is the kernel functionality to provide NAT in the masquerade
+         flavour (automatic source address selection).
+
+config NFT_MASQ_IPV4
+       tristate "IPv4 masquerading support for nf_tables"
+       depends on NF_TABLES_IPV4
+       depends on NFT_MASQ
+       select NF_NAT_MASQUERADE_IPV4
+       help
+         This is the expression that provides IPv4 masquerading support for
+         nf_tables.
+
 config NF_NAT_SNMP_BASIC
        tristate "Basic SNMP-ALG support"
        depends on NF_CONNTRACK_SNMP
@@ -231,18 +246,6 @@ config IP_NF_NAT
 
 if IP_NF_NAT
 
-config NF_NAT_MASQUERADE_IPV4
-       tristate "IPv4 masquerade support"
-       help
-       This is the kernel functionality to provide NAT in the masquerade
-       flavour (automatic source address selection).
-
-config NFT_MASQ_IPV4
-       tristate "IPv4 masquerading support for nf_tables"
-       depends on NF_TABLES_IPV4
-       depends on NFT_MASQ
-       select NF_NAT_MASQUERADE_IPV4
-
 config IP_NF_TARGET_MASQUERADE
        tristate "MASQUERADE target support"
        select NF_NAT_MASQUERADE_IPV4

diff --git a/net/ipv6/netfilter/Kconfig b/net/ipv6/netfilter/Kconfig
index e854062d0c363e2273fcfd1dd0bc1ff432a1dc5a..bb1a40db7be1c647562678399945f51c4870372b 100644 (file)
--- a/net/ipv6/netfilter/Kconfig
+++ b/net/ipv6/netfilter/Kconfig
@@ -71,6 +71,21 @@ config NFT_CHAIN_NAT_IPV6
          packet transformations such as the source, destination address and
          source and destination ports.
 
+config NF_NAT_MASQUERADE_IPV6
+       tristate "IPv6 masquerade support"
+       help
+         This is the kernel functionality to provide NAT in the masquerade
+         flavour (automatic source address selection) for IPv6.
+
+config NFT_MASQ_IPV6
+       tristate "IPv6 masquerade support for nf_tables"
+       depends on NF_TABLES_IPV6
+       depends on NFT_MASQ
+       select NF_NAT_MASQUERADE_IPV6
+       help
+         This is the expression that provides IPv4 masquerading support for
+         nf_tables.
+
 endif # NF_NAT_IPV6
 
 config IP6_NF_IPTABLES
@@ -261,18 +276,6 @@ config IP6_NF_NAT
 
 if IP6_NF_NAT
 
-config NF_NAT_MASQUERADE_IPV6
-       tristate "IPv6 masquerade support"
-       help
-        This is the kernel functionality to provide NAT in the masquerade
-        flavour (automatic source address selection) for IPv6.
-
-config NFT_MASQ_IPV6
-       tristate "IPv6 masquerade support for nf_tables"
-       depends on NF_TABLES_IPV6
-       depends on NFT_MASQ
-       select NF_NAT_MASQUERADE_IPV6
-
 config IP6_NF_TARGET_MASQUERADE
        tristate "MASQUERADE target support"
        select NF_NAT_MASQUERADE_IPV6