From 1e028ac51e4d033cc1a8a06850ca8c6469206761 Mon Sep 17 00:00:00 2001 From: Martin Schiller Date: Wed, 2 Nov 2022 07:41:04 +0100 Subject: [PATCH] kernel: further cleanup of xfrm[4|6]_mode* In my commit da5c45f4d886 ("kernel: remove handling of xfrm[4|6]_mode_* modules") I missed a few default config options and description entries. Those should be gone as well. Fixes: da5c45f4d886 ("kernel: remove handling of xfrm[4|6]_mode_* modules") Signed-off-by: Martin Schiller --- package/kernel/linux/modules/netsupport.mk | 6 ------ target/linux/generic/config-5.10 | 4 ---- target/linux/generic/config-5.15 | 4 ---- 3 files changed, 14 deletions(-) diff --git a/package/kernel/linux/modules/netsupport.mk b/package/kernel/linux/modules/netsupport.mk index 0fc3b5cce3d..a8c343f44b1 100644 --- a/package/kernel/linux/modules/netsupport.mk +++ b/package/kernel/linux/modules/netsupport.mk @@ -238,9 +238,6 @@ define KernelPackage/ipsec4/description - ah4 - esp4 - ipcomp4 - - xfrm4_mode_beet - - xfrm4_mode_transport - - xfrm4_mode_tunnel - xfrm4_tunnel endef @@ -273,9 +270,6 @@ define KernelPackage/ipsec6/description - ah6 - esp6 - ipcomp6 - - xfrm6_mode_beet - - xfrm6_mode_transport - - xfrm6_mode_tunnel - xfrm6_tunnel endef diff --git a/target/linux/generic/config-5.10 b/target/linux/generic/config-5.10 index 4b2837de059..103fe6de15f 100644 --- a/target/linux/generic/config-5.10 +++ b/target/linux/generic/config-5.10 @@ -2540,10 +2540,6 @@ CONFIG_INET=y # CONFIG_INET6_ESPINTCP is not set # CONFIG_INET6_IPCOMP is not set # CONFIG_INET6_TUNNEL is not set -# CONFIG_INET6_XFRM_MODE_BEET is not set -# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set -# CONFIG_INET6_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET6_XFRM_MODE_TUNNEL is not set # CONFIG_INET6_XFRM_TUNNEL is not set # CONFIG_INET_AH is not set # CONFIG_INET_DIAG is not set diff --git a/target/linux/generic/config-5.15 b/target/linux/generic/config-5.15 index 1e49471ae2b..c36cba70538 100644 --- a/target/linux/generic/config-5.15 +++ b/target/linux/generic/config-5.15 @@ -2641,10 +2641,6 @@ CONFIG_INET=y # CONFIG_INET6_ESPINTCP is not set # CONFIG_INET6_IPCOMP is not set # CONFIG_INET6_TUNNEL is not set -# CONFIG_INET6_XFRM_MODE_BEET is not set -# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set -# CONFIG_INET6_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET6_XFRM_MODE_TUNNEL is not set # CONFIG_INET6_XFRM_TUNNEL is not set # CONFIG_INET_AH is not set # CONFIG_INET_DIAG is not set -- 2.30.2