aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorDENG Qingfang <dengqf6@mail2.sysu.edu.cn>2020-04-19 19:23:24 +0800
committerKoen Vandeputte <koen.vandeputte@ncentric.com>2020-04-20 15:07:17 +0200
commit29a458b0cae3435bce41136ee3b4132b4103ffae (patch)
treeb373de04776cc61c8a7b31c93325de0a9b7b5343 /include
parentbe172e663f318ec364c13f795df025bbcce9ac18 (diff)
downloadupstream-29a458b0cae3435bce41136ee3b4132b4103ffae.tar.gz
upstream-29a458b0cae3435bce41136ee3b4132b4103ffae.tar.bz2
upstream-29a458b0cae3435bce41136ee3b4132b4103ffae.zip
kernel: netfilter.mk: fix kmod-ipt-nat6 installation on 5.4
xt_MASQUERADE.ko is picked up by both kmod-ipt-nat and kmod-ipt-nat6, causing conflict As kmod-ipt-nat6 already depends on kmod-ipt-nat, remove xt_MASQUERADE from it Fixes: FS#2924 Fixes: 0fad8af85158 ("kernel: Include xt_MASQUERADE for kernel 5.2 and later") Signed-off-by: DENG Qingfang <dengqf6@mail2.sysu.edu.cn>
Diffstat (limited to 'include')
-rw-r--r--include/netfilter.mk1
1 files changed, 0 insertions, 1 deletions
diff --git a/include/netfilter.mk b/include/netfilter.mk
index 306975c31b..c95bcb504d 100644
--- a/include/netfilter.mk
+++ b/include/netfilter.mk
@@ -196,7 +196,6 @@ $(eval $(if $(NF_KMOD),$(call nf_add,IPT_NAT,CONFIG_NETFILTER_XT_NAT, $(P_XT)xt_
$(eval $(if $(NF_KMOD),$(call nf_add,IPT_NAT,CONFIG_IP_NF_NAT, $(P_V4)iptable_nat),))
$(eval $(if $(NF_KMOD),$(call nf_add,IPT_NAT6,CONFIG_IP6_NF_NAT, $(P_V6)ip6table_nat),))
$(eval $(if $(NF_KMOD),$(call nf_add,IPT_NAT6,CONFIG_IP6_NF_TARGET_MASQUERADE, $(P_V6)ip6t_MASQUERADE, lt 5.2),))
-$(eval $(if $(NF_KMOD),$(call nf_add,IPT_NAT6,CONFIG_IP6_NF_TARGET_MASQUERADE, $(P_XT)xt_MASQUERADE, ge 5.2),))
$(eval $(if $(NF_KMOD),$(call nf_add,IPT_NAT6,CONFIG_IP6_NF_TARGET_NPT, $(P_V6)ip6t_NPT),))
# userland only