[openwrt/openwrt] xfrm: simplify the check for necessary kernel support

LEDE Commits lede-commits at lists.infradead.org
Sat Mar 13 20:12:52 GMT 2021


dedeckeh pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/8704d138df5e7a30fb084a5450b07460d128a15a

commit 8704d138df5e7a30fb084a5450b07460d128a15a
Author: Alin Nastac <alin.nastac at technicolor.com>
AuthorDate: Mon Mar 1 09:51:31 2021 +0100

    xfrm: simplify the check for necessary kernel support
    
    [ -d /sys/module/xfrm_interface ] is enough to check if
    CONFIG_XFRM_INTERFACE support was enabled in kernel.
    
    Signed-off-by: Alin Nastac <alin.nastac at technicolor.com>
---
 package/network/config/xfrm/Makefile      | 2 +-
 package/network/config/xfrm/files/xfrm.sh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/network/config/xfrm/Makefile b/package/network/config/xfrm/Makefile
index bcee89f82c..777f20c77c 100644
--- a/package/network/config/xfrm/Makefile
+++ b/package/network/config/xfrm/Makefile
@@ -2,7 +2,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=xfrm
-PKG_RELEASE:=3
+PKG_RELEASE:=4
 PKG_LICENSE:=GPL-2.0
 
 include $(INCLUDE_DIR)/package.mk
diff --git a/package/network/config/xfrm/files/xfrm.sh b/package/network/config/xfrm/files/xfrm.sh
index ca7c3380e6..bdebd4b9c3 100755
--- a/package/network/config/xfrm/files/xfrm.sh
+++ b/package/network/config/xfrm/files/xfrm.sh
@@ -68,5 +68,5 @@ proto_xfrm_init_config() {
 
 
 [ -n "$INCLUDE_ONLY" ] || {
-	[ -f /lib/modules/$(uname -r)/xfrm_interface.ko -o -d /sys/module/xfrm_interface ] && add_protocol xfrm
+	[ -d /sys/module/xfrm_interface ] && add_protocol xfrm
 }



More information about the lede-commits mailing list