From: Marko Ratkaj <marko.ratkaj@sartura.hr>
Date: Wed, 19 Sep 2018 10:46:22 +0000 (+0200)
Subject: include: netfilter: prepare for kernel 4.19
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=ba0f491e27c53d91508c98cd5c2ae42ab1813427;p=openwrt%2Fstaging%2Fwigyori.git

include: netfilter: prepare for kernel 4.19

With kernel 4.19 kernel module nf_conntrack_ipv6 no longer exists.
Instead, nf_conntrack module handles both IPv4 and IPv6 and it now
depends on nf_defrag_ipv6. This patch adds a version check to properly
handle this.

Signed-off-by: Marko Ratkaj <marko.ratkaj@sartura.hr>
---

diff --git a/include/netfilter.mk b/include/netfilter.mk
index 510aa183ca..8b9cc831cf 100644
--- a/include/netfilter.mk
+++ b/include/netfilter.mk
@@ -156,8 +156,12 @@ $(eval $(if $(NF_KMOD),$(call nf_add,NF_REJECT6,CONFIG_NF_REJECT_IPV6, $(P_V6)nf
 
 $(eval $(if $(NF_KMOD),$(call nf_add,NF_IPT6,CONFIG_IP6_NF_IPTABLES, $(P_V6)ip6_tables),))
 
+ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),lt,4.19.0)),1)
 $(eval $(if $(NF_KMOD),$(call nf_add,NF_CONNTRACK6,CONFIG_NF_DEFRAG_IPV6, $(P_V6)nf_defrag_ipv6),))
 $(eval $(if $(NF_KMOD),$(call nf_add,NF_CONNTRACK6,CONFIG_NF_CONNTRACK_IPV6, $(P_V6)nf_conntrack_ipv6),))
+else
+$(eval $(if $(NF_KMOD),$(call nf_add,NF_CONNTRACK,CONFIG_NF_DEFRAG_IPV6, $(P_V6)nf_defrag_ipv6),))
+endif
 
 $(eval $(if $(NF_KMOD),$(call nf_add,IPT_IPV6,CONFIG_IP6_NF_FILTER, $(P_V6)ip6table_filter),))
 $(eval $(if $(NF_KMOD),$(call nf_add,IPT_IPV6,CONFIG_IP6_NF_MANGLE, $(P_V6)ip6table_mangle),))
@@ -370,7 +374,9 @@ $(eval $(if $(NF_KMOD),$(call nf_add,NFT_NAT6,CONFIG_NFT_MASQ_IPV6, $(P_V6)nft_m
 IPT_BUILTIN += $(NF_IPT-y) $(NF_IPT-m)
 IPT_BUILTIN += $(IPT_CORE-y) $(IPT_CORE-m)
 IPT_BUILTIN += $(NF_CONNTRACK-y)
+ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),lt,4.19.0)),1)
 IPT_BUILTIN += $(NF_CONNTRACK6-y)
+endif
 IPT_BUILTIN += $(IPT_CONNTRACK-y)
 IPT_BUILTIN += $(IPT_CONNTRACK_EXTRA-y)
 IPT_BUILTIN += $(IPT_EXTRA-y)