From: Hauke Mehrtens Date: Sun, 18 Nov 2018 13:40:07 +0000 (+0100) Subject: kernel: netfilter: Add nf_defrag_ipv6.ko to NF_CONNTRACK on 4.19 X-Git-Tag: v19.07.0-rc1~1909 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=35929059b757de92ff14f6f91addf034302b5635;p=oweals%2Fopenwrt.git kernel: netfilter: Add nf_defrag_ipv6.ko to NF_CONNTRACK on 4.19 In kernel commit a0ae2562c6c ("netfilter: conntrack: remove l3proto abstraction") The modules nf_conntrack_ipv4.ko, nf_conntrack_ipv6.ko and nf_conntrack.ko were squashed together into one module. This module now depends on nf_defrag_ipv6 when IPv6 support was activated. This is part of the main netfilter packages, so add nf_defrag_ipv6.ko also to the default netfilter packages on kernel 4.19 and later. Signed-off-by: Hauke Mehrtens --- diff --git a/include/netfilter.mk b/include/netfilter.mk index 510aa183ca..5bf3dbdb02 100644 --- a/include/netfilter.mk +++ b/include/netfilter.mk @@ -156,7 +156,8 @@ $(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),)) -$(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_CONNTRACK,CONFIG_NF_DEFRAG_IPV6, $(P_V6)nf_defrag_ipv6, ge 4.19),)) +$(eval $(if $(NF_KMOD),$(call nf_add,NF_CONNTRACK6,CONFIG_NF_DEFRAG_IPV6, $(P_V6)nf_defrag_ipv6, lt 4.19),)) $(eval $(if $(NF_KMOD),$(call nf_add,NF_CONNTRACK6,CONFIG_NF_CONNTRACK_IPV6, $(P_V6)nf_conntrack_ipv6),)) $(eval $(if $(NF_KMOD),$(call nf_add,IPT_IPV6,CONFIG_IP6_NF_FILTER, $(P_V6)ip6table_filter),))