aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2018-11-18 14:40:07 +0100
committerHauke Mehrtens <hauke@hauke-m.de>2018-12-15 14:28:50 +0100
commit35929059b757de92ff14f6f91addf034302b5635 (patch)
tree78efd4e4da5a6bacb9a966ff692d7a4d855b1299 /include
parentd234431c0cc3f8d8d9a562b5ebf29bd41f77401d (diff)
downloadupstream-35929059b757de92ff14f6f91addf034302b5635.tar.gz
upstream-35929059b757de92ff14f6f91addf034302b5635.tar.bz2
upstream-35929059b757de92ff14f6f91addf034302b5635.zip
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 <hauke@hauke-m.de>
Diffstat (limited to 'include')
-rw-r--r--include/netfilter.mk3
1 files changed, 2 insertions, 1 deletions
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),))