kernel: mode_beet mode_transport mode_tunnel xfram modules

[openwrt/staging/nbd.git] / package / kernel / linux / modules / netsupport.mk

diff --git a/package/kernel/linux/modules/netsupport.mk b/package/kernel/linux/modules/netsupport.mk
index 3656441650c21a48e778ff098037fefb8f693760..b3b32877a3cf4ca67d86a05e93a8a489579063d4 100644 (file)
--- a/package/kernel/linux/modules/netsupport.mk
+++ b/package/kernel/linux/modules/netsupport.mk
@@ -267,16 +267,14 @@ endef
 
 $(eval $(call KernelPackage,ipsec))
 
-
-IPSEC4-m:= \
+IPSEC4-m = \
        ipv4/ah4 \
        ipv4/esp4 \
-       ipv4/xfrm4_mode_beet \
-       ipv4/xfrm4_mode_transport \
-       ipv4/xfrm4_mode_tunnel \
        ipv4/xfrm4_tunnel \
        ipv4/ipcomp \
 
+IPSEC4-m += $(ifeq ($$(strip $$(call CompareKernelPatchVer,$$(KERNEL_PATCHVER),le,5.2))),ipv4/xfrm4_mode_beet ipv4/xfrm4_mode_transport ipv4/xfrm4_mode_tunnel)
+
 define KernelPackage/ipsec4
   SUBMENU:=$(NETWORK_SUPPORT_MENU)
   TITLE:=IPsec related modules (IPv4)
@@ -309,15 +307,14 @@ endef
 $(eval $(call KernelPackage,ipsec4))
 
 
-IPSEC6-m:= \
+IPSEC6-m = \
        ipv6/ah6 \
        ipv6/esp6 \
-       ipv6/xfrm6_mode_beet \
-       ipv6/xfrm6_mode_transport \
-       ipv6/xfrm6_mode_tunnel \
        ipv6/xfrm6_tunnel \
        ipv6/ipcomp6 \
 
+IPSEC6-m += $(ifeq ($$(strip $$(call CompareKernelPatchVer,$$(KERNEL_PATCHVER),le,5.2))),ipv6/xfrm6_mode_beet ipv6/xfrm6_mode_transport ipv6/xfrm6_mode_tunnel)
+
 define KernelPackage/ipsec6
   SUBMENU:=$(NETWORK_SUPPORT_MENU)
   TITLE:=IPsec related modules (IPv6)
@@ -1143,7 +1140,7 @@ $(eval $(call KernelPackage,rxrpc))
 define KernelPackage/mpls
   SUBMENU:=$(NETWORK_SUPPORT_MENU)
   TITLE:=MPLS support
-  DEPENDS:=+LINUX_4_19:kmod-iptunnel
+  DEPENDS:=+!LINUX_4_14:kmod-iptunnel
   KCONFIG:= \
        CONFIG_MPLS=y \
        CONFIG_LWTUNNEL=y \