[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <20180706130005.3640993-1-arnd@arndb.de>
Date: Fri, 6 Jul 2018 14:59:52 +0200
From: Arnd Bergmann <arnd@...db.de>
To: Pablo Neira Ayuso <pablo@...filter.org>,
Jozsef Kadlecsik <kadlec@...ckhole.kfki.hu>,
Florian Westphal <fw@...len.de>,
"David S. Miller" <davem@...emloft.net>
Cc: Arnd Bergmann <arnd@...db.de>,
Máté Eckl <ecklm94@...il.com>,
Fernando Fernandez Mancera <ffmancera@...eup.net>,
"Pablo M. Bermudo Garay" <pablombg@...il.com>,
Felix Fietkau <nbd@....name>, netfilter-devel@...r.kernel.org,
coreteam@...filter.org, netdev@...r.kernel.org,
linux-kernel@...r.kernel.org
Subject: [PATCH] netfilter: conntrack: add weak IPV6 dependency
Now that the conntrack module contains code for ipv6, we can no longer
have it built-in while IPv6 itself is a loadable module:
net/netfilter/nf_conntrack_proto.o: In function `nf_ct_netns_do_get':
nf_conntrack_proto.c:(.text+0x88c): undefined reference to `nf_defrag_ipv6_enable'
net/netfilter/nf_conntrack_proto.o:(.rodata+0x178): undefined reference to `nf_conntrack_l4proto_icmpv6'
This adds a dependency on IPv6 that makes it possible to still build
the conntrack module with IPv6 disabled, but avoids the broken configuration.
Fixes: 66c524acfb51 ("netfilter: conntrack: remove l3proto abstraction")
Signed-off-by: Arnd Bergmann <arnd@...db.de>
---
net/netfilter/Kconfig | 1 +
1 file changed, 1 insertion(+)
diff --git a/net/netfilter/Kconfig b/net/netfilter/Kconfig
index 74df382bf2ba..e42c38c99741 100644
--- a/net/netfilter/Kconfig
+++ b/net/netfilter/Kconfig
@@ -49,6 +49,7 @@ config NETFILTER_NETLINK_LOG
config NF_CONNTRACK
tristate "Netfilter connection tracking support"
default m if NETFILTER_ADVANCED=n
+ depends on IPV6 || !IPV6
select NF_DEFRAG_IPV4
select NF_DEFRAG_IPV6 if IPV6
help
--
2.9.0
Powered by blists - more mailing lists