Patchwork [-nftables,3/3] netfilter: fix missing dependency

login
register
mail settings
Submitter Pablo Neira
Date Sept. 19, 2013, 8:18 p.m.
Message ID <1379621933-6064-3-git-send-email-pablo@netfilter.org>
Download mbox | patch
Permalink /patch/276055/
State Accepted
Headers show

Comments

Pablo Neira - Sept. 19, 2013, 8:18 p.m.
With CONFIG_NFT_CHAIN_NAT_IPV4=y

net/ipv4/netfilter/nft_chain_nat_ipv4.c: In function ‘nf_nat_fn’:
net/ipv4/netfilter/nft_chain_nat_ipv4.c:56:1: error: ‘NF_CT_EXT_NAT’ undeclared (first use in this function)
net/ipv4/netfilter/nft_chain_nat_ipv4.c:56:1: note: each undeclared identifier is reported only once for each function it appears in

Reported-by: Bjørnar Ness <bjornar.ness@gmail.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
---
 net/ipv4/netfilter/Kconfig |    2 +-
 net/ipv6/netfilter/Kconfig |    2 +-
 net/netfilter/Kconfig      |    1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

Patch

diff --git a/net/ipv4/netfilter/Kconfig b/net/ipv4/netfilter/Kconfig
index 4d6f03a..1ea0da4 100644
--- a/net/ipv4/netfilter/Kconfig
+++ b/net/ipv4/netfilter/Kconfig
@@ -50,7 +50,7 @@  config NFT_CHAIN_ROUTE_IPV4
 
 config NFT_CHAIN_NAT_IPV4
 	depends on NF_TABLES_IPV4
-	depends on NFT_NAT
+	depends on NF_NAT_IPV4 && NFT_NAT
 	tristate "IPv4 nf_tables nat chain support"
 
 config NF_TABLES_ARP
diff --git a/net/ipv6/netfilter/Kconfig b/net/ipv6/netfilter/Kconfig
index 61270d1..4863516 100644
--- a/net/ipv6/netfilter/Kconfig
+++ b/net/ipv6/netfilter/Kconfig
@@ -35,7 +35,7 @@  config NFT_CHAIN_ROUTE_IPV6
 
 config NFT_CHAIN_NAT_IPV6
 	depends on NF_TABLES_IPV6
-	depends on NFT_NAT
+	depends on NF_NAT_IPV6 && NFT_NAT
 	tristate "IPv6 nf_tables nat chain support"
 
 config IP6_NF_IPTABLES
diff --git a/net/netfilter/Kconfig b/net/netfilter/Kconfig
index 2e0c3f8..8e2ffe3 100644
--- a/net/netfilter/Kconfig
+++ b/net/netfilter/Kconfig
@@ -464,6 +464,7 @@  config NFT_LIMIT
 config NFT_NAT
 	depends on NF_TABLES
 	depends on NF_CONNTRACK
+	depends on NF_NAT
 	tristate "Netfilter nf_tables nat module"
 
 config NFT_COMPAT