kernel: remove handling of xfrm[4|6]_mode_* modules

For kernel versions before 5.2, the required IPsec modes have to be
enabled explicitly (they are built-in for newer kernels).

Commit 1556ed155a9a ("kernel: mode_beet mode_transport mode_tunnel xfram
modules") tried to handle this, but it does not really work.

Since we don't support these kernel versions anymore and the code is
also broken, let's remove it.

Signed-off-by: Martin Schiller <ms@dev.tdt.de>
[Remove old generic config options too]
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>

diff --git a/package/kernel/linux/modules/netsupport.mk b/package/kernel/linux/modules/netsupport.mk
index 9afee41aedf9d3a62de3f6b345d05853b492b998..0fc3b5cce3d1524d708f2186202ad58eada5b006 100644 (file)
--- a/package/kernel/linux/modules/netsupport.mk
+++ b/package/kernel/linux/modules/netsupport.mk
@@ -215,10 +215,8 @@ $(eval $(call KernelPackage,ipsec))
 IPSEC4-m = \
        ipv4/ah4 \
        ipv4/esp4 \
-       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)
+       ipv4/xfrm4_tunnel
 
 define KernelPackage/ipsec4
   SUBMENU:=$(NETWORK_SUPPORT_MENU)
@@ -228,9 +226,6 @@ define KernelPackage/ipsec4
        CONFIG_INET_AH \
        CONFIG_INET_ESP \
        CONFIG_INET_IPCOMP \
-       CONFIG_INET_XFRM_MODE_BEET \
-       CONFIG_INET_XFRM_MODE_TRANSPORT \
-       CONFIG_INET_XFRM_MODE_TUNNEL \
        CONFIG_INET_XFRM_TUNNEL \
        CONFIG_INET_ESP_OFFLOAD=n
   FILES:=$(foreach mod,$(IPSEC4-m),$(LINUX_DIR)/net/$(mod).ko)
@@ -255,10 +250,8 @@ $(eval $(call KernelPackage,ipsec4))
 IPSEC6-m = \
        ipv6/ah6 \
        ipv6/esp6 \
-       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)
+       ipv6/xfrm6_tunnel
 
 define KernelPackage/ipsec6
   SUBMENU:=$(NETWORK_SUPPORT_MENU)
@@ -268,9 +261,6 @@ define KernelPackage/ipsec6
        CONFIG_INET6_AH \
        CONFIG_INET6_ESP \
        CONFIG_INET6_IPCOMP \
-       CONFIG_INET6_XFRM_MODE_BEET \
-       CONFIG_INET6_XFRM_MODE_TRANSPORT \
-       CONFIG_INET6_XFRM_MODE_TUNNEL \
        CONFIG_INET6_XFRM_TUNNEL \
        CONFIG_INET6_ESP_OFFLOAD=n
   FILES:=$(foreach mod,$(IPSEC6-m),$(LINUX_DIR)/net/$(mod).ko)

diff --git a/target/linux/generic/config-5.10 b/target/linux/generic/config-5.10
index cef0c7d0a8b8504e5ffbe55b8d89b015799f48b5..4b2837de059ae9284b4920b92ca92e1bb56465a4 100644 (file)
--- a/target/linux/generic/config-5.10
+++ b/target/linux/generic/config-5.10
@@ -2554,9 +2554,6 @@ CONFIG_INET=y
 # CONFIG_INET_TCP_DIAG is not set
 # CONFIG_INET_TUNNEL is not set
 # CONFIG_INET_UDP_DIAG is not set
-# CONFIG_INET_XFRM_MODE_BEET is not set
-# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
-# CONFIG_INET_XFRM_MODE_TUNNEL is not set
 # CONFIG_INET_XFRM_TUNNEL is not set
 # CONFIG_INFINIBAND is not set
 # CONFIG_INFTL is not set

diff --git a/target/linux/generic/config-5.15 b/target/linux/generic/config-5.15
index 8b2d6b54913a17ce5c2e947d48092b7372dd4f36..1e49471ae2baa6d957182687c66d219b8924962b 100644 (file)
--- a/target/linux/generic/config-5.15
+++ b/target/linux/generic/config-5.15
@@ -2655,9 +2655,6 @@ CONFIG_INET=y
 # CONFIG_INET_TCP_DIAG is not set
 # CONFIG_INET_TUNNEL is not set
 # CONFIG_INET_UDP_DIAG is not set
-# CONFIG_INET_XFRM_MODE_BEET is not set
-# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
-# CONFIG_INET_XFRM_MODE_TUNNEL is not set
 # CONFIG_INET_XFRM_TUNNEL is not set
 # CONFIG_INFINIBAND is not set
 # CONFIG_INFTL is not set