Commit e0758412 authored by Florian Westphal's avatar Florian Westphal Committed by Pablo Neira Ayuso

netfilter: kconfig: nat related expression depend on nftables core

NF_TABLES_IPV4 is now boolean so it is possible to set

NF_TABLES=m
NF_TABLES_IPV4=y
NFT_CHAIN_NAT_IPV4=y

which causes:
nft_chain_nat_ipv4.c:(.text+0x6d): undefined reference to `nft_do_chain'

Wrap NFT_CHAIN_NAT_IPV4 and related nat expressions with NF_TABLES to
restore the dependency.
Reported-by: default avatarRandy Dunlap <rdunlap@infradead.org>
Fixes: 02c7b25e ("netfilter: nf_tables: build-in filter chain type")
Signed-off-by: default avatarFlorian Westphal <fw@strlen.de>
Acked-by: default avatarRandy Dunlap <rdunlap@infradead.org>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent 0434ccdc
...@@ -106,6 +106,10 @@ config NF_NAT_IPV4 ...@@ -106,6 +106,10 @@ config NF_NAT_IPV4
if NF_NAT_IPV4 if NF_NAT_IPV4
config NF_NAT_MASQUERADE_IPV4
bool
if NF_TABLES
config NFT_CHAIN_NAT_IPV4 config NFT_CHAIN_NAT_IPV4
depends on NF_TABLES_IPV4 depends on NF_TABLES_IPV4
tristate "IPv4 nf_tables nat chain support" tristate "IPv4 nf_tables nat chain support"
...@@ -115,9 +119,6 @@ config NFT_CHAIN_NAT_IPV4 ...@@ -115,9 +119,6 @@ config NFT_CHAIN_NAT_IPV4
packet transformations such as the source, destination address and packet transformations such as the source, destination address and
source and destination ports. source and destination ports.
config NF_NAT_MASQUERADE_IPV4
bool
config NFT_MASQ_IPV4 config NFT_MASQ_IPV4
tristate "IPv4 masquerading support for nf_tables" tristate "IPv4 masquerading support for nf_tables"
depends on NF_TABLES_IPV4 depends on NF_TABLES_IPV4
...@@ -135,6 +136,7 @@ config NFT_REDIR_IPV4 ...@@ -135,6 +136,7 @@ config NFT_REDIR_IPV4
help help
This is the expression that provides IPv4 redirect support for This is the expression that provides IPv4 redirect support for
nf_tables. nf_tables.
endif # NF_TABLES
config NF_NAT_SNMP_BASIC config NF_NAT_SNMP_BASIC
tristate "Basic SNMP-ALG support" tristate "Basic SNMP-ALG support"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment