netfilter: nat: merge nf_nat_ipv4,6 into nat core

[linux-block.git] / net / ipv4 / netfilter / Kconfig

diff --git a/net/ipv4/netfilter/Kconfig b/net/ipv4/netfilter/Kconfig
index 80f72cc5ca8dbcc3c00d90acc49454daf6ddfe0d..8688461ed07753e53702f9eeee267ad6122f414e 100644 (file)
--- a/net/ipv4/netfilter/Kconfig
+++ b/net/ipv4/netfilter/Kconfig
@@ -94,20 +94,7 @@ config NF_REJECT_IPV4
        tristate "IPv4 packet rejection"
        default m if NETFILTER_ADVANCED=n
 
-config NF_NAT_IPV4
-       tristate "IPv4 NAT"
-       depends on NF_CONNTRACK
-       default m if NETFILTER_ADVANCED=n
-       select NF_NAT
-       help
-         The IPv4 NAT option allows masquerading, port forwarding and other
-         forms of full Network Address Port Translation. This can be
-         controlled by iptables or nft.
-
-if NF_NAT_IPV4
-
-config NF_NAT_MASQUERADE_IPV4
-       bool
+if NF_NAT
 
 if NF_TABLES
 config NFT_CHAIN_NAT_IPV4
@@ -123,7 +110,7 @@ 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
+       select NF_NAT_MASQUERADE
        help
          This is the expression that provides IPv4 masquerading support for
          nf_tables.
@@ -166,7 +153,7 @@ config NF_NAT_H323
        depends on NF_CONNTRACK
        default NF_CONNTRACK_H323
 
-endif # NF_NAT_IPV4
+endif # NF_NAT
 
 config IP_NF_IPTABLES
        tristate "IP tables support (required for filtering/masq/NAT)"
@@ -263,7 +250,6 @@ config IP_NF_NAT
        depends on NF_CONNTRACK
        default m if NETFILTER_ADVANCED=n
        select NF_NAT
-       select NF_NAT_IPV4
        select NETFILTER_XT_NAT
        help
          This enables the `nat' table in iptables. This allows masquerading,
@@ -276,7 +262,7 @@ if IP_NF_NAT
 
 config IP_NF_TARGET_MASQUERADE
        tristate "MASQUERADE target support"
-       select NF_NAT_MASQUERADE_IPV4
+       select NF_NAT_MASQUERADE
        default m if NETFILTER_ADVANCED=n
        help
          Masquerading is a special case of NAT: all outgoing connections are