diff options
author | Florian Westphal <fw@strlen.de> | 2015-05-07 08:15:58 -0400 |
---|---|---|
committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2015-05-15 14:18:27 -0400 |
commit | 595ca5880b37d4aa3c292d75531577175d36b225 (patch) | |
tree | dd97dfab079c28d2d49284bdc447848a0e2099bb | |
parent | f30bf2a5cac6c60ab366c4bc6db913597bf4d6ab (diff) |
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: Liu Hua <liusdu@126.com>
Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
-rw-r--r-- | net/netfilter/Kconfig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/netfilter/Kconfig b/net/netfilter/Kconfig index f70e34a68f70..a0f3e6a3c7d1 100644 --- a/net/netfilter/Kconfig +++ b/net/netfilter/Kconfig | |||
@@ -863,6 +863,7 @@ config NETFILTER_XT_TARGET_TPROXY | |||
863 | depends on NETFILTER_XTABLES | 863 | depends on NETFILTER_XTABLES |
864 | depends on NETFILTER_ADVANCED | 864 | depends on NETFILTER_ADVANCED |
865 | depends on (IPV6 || IPV6=n) | 865 | depends on (IPV6 || IPV6=n) |
866 | depends on (IP6_NF_IPTABLES || IP6_NF_IPTABLES=n) | ||
866 | depends on IP_NF_MANGLE | 867 | depends on IP_NF_MANGLE |
867 | select NF_DEFRAG_IPV4 | 868 | select NF_DEFRAG_IPV4 |
868 | select NF_DEFRAG_IPV6 if IP6_NF_IPTABLES | 869 | select NF_DEFRAG_IPV6 if IP6_NF_IPTABLES |
@@ -1356,6 +1357,7 @@ config NETFILTER_XT_MATCH_SOCKET | |||
1356 | depends on NETFILTER_ADVANCED | 1357 | depends on NETFILTER_ADVANCED |
1357 | depends on !NF_CONNTRACK || NF_CONNTRACK | 1358 | depends on !NF_CONNTRACK || NF_CONNTRACK |
1358 | depends on (IPV6 || IPV6=n) | 1359 | depends on (IPV6 || IPV6=n) |
1360 | depends on (IP6_NF_IPTABLES || IP6_NF_IPTABLES=n) | ||
1359 | select NF_DEFRAG_IPV4 | 1361 | select NF_DEFRAG_IPV4 |
1360 | select NF_DEFRAG_IPV6 if IP6_NF_IPTABLES | 1362 | select NF_DEFRAG_IPV6 if IP6_NF_IPTABLES |
1361 | help | 1363 | help |