Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 595ca588 authored by Florian Westphal's avatar Florian Westphal Committed by Pablo Neira Ayuso
Browse files

netfilter: avoid build error if TPROXY/SOCKET=y && NF_DEFRAG_IPV6=m 



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: default avatarLiu Hua <liusdu@126.com>
Signed-off-by: default avatarFlorian Westphal <fw@strlen.de>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent f30bf2a5

net/netfilter/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -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)

	select NF_DEFRAG_IPV4

	select NF_DEFRAG_IPV6 if IP6_NF_IPTABLES

	help