Re: [PATCH 2/4] netfilter: avoid build error if TPROXY/SOCKET=y && NF_DEFRAG_IPV6=m

[Pablo Neira Ayuso <pablo@netfilter.org>]

On Sat, May 16, 2015 at 10:07:27PM +0300, Sergei Shtylyov wrote:
> Hello.
> 
> On 05/16/2015 09:47 PM, Pablo Neira Ayuso wrote:
> 
> >From: Florian Westphal <fw@strlen.de>
> 
> >With TPROXY=y but DEFRAG_IPV6=m we get build failure:
> 
> >net/built-in.o: In function `tproxy_tg_init':
> >net/netfilter/xt_TPROXY.c:588: undefined reference to `nf_defrag_ipv6_enable'
> 
> >If DEFRAG_IPV6 is modular, TPROXY must be too.
> >(or both must be builtin).
> 
> >This enforces =m for both.
> 
> >Reported-and-tested-by: Liu Hua <liusdu@126.com>
> >Signed-off-by: Florian Westphal <fw@strlen.de>
> >Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
> >---
> >  net/netfilter/Kconfig |    2 ++
> >  1 file changed, 2 insertions(+)
> 
> >diff --git a/net/netfilter/Kconfig b/net/netfilter/Kconfig
> >index f70e34a..a0f3e6a3 100644
> >--- a/net/netfilter/Kconfig
> >+++ b/net/netfilter/Kconfig
> >@@ -863,6 +863,7 @@ config NETFILTER_XT_TARGET_TPROXY
> >  	depends on NETFILTER_XTABLES
> >  	depends on NETFILTER_ADVANCED
> >  	depends on (IPV6 || IPV6=n)
> >+	depends on (IP6_NF_IPTABLES || IP6_NF_IPTABLES=n)
> >  	depends on IP_NF_MANGLE
> >  	select NF_DEFRAG_IPV4
> >  	select NF_DEFRAG_IPV6 if IP6_NF_IPTABLES
> >@@ -1356,6 +1357,7 @@ config NETFILTER_XT_MATCH_SOCKET
> >  	depends on NETFILTER_ADVANCED
> >  	depends on !NF_CONNTRACK || NF_CONNTRACK
> >  	depends on (IPV6 || IPV6=n)
> >+	depends on (IP6_NF_IPTABLES || IP6_NF_IPTABLES=n)
> 
>    Parens not needed here and in the previous hunk.

OK, but we've been using parens in quite many other spots in the
Netfilter Kconfig files. So if you don't mind, we'll send follow up
large patch to sort out this for net-next.

Thank you.