[openwrt/openwrt] vti: use alternative way to check if kernel support is enabled

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


dedeckeh pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/65ca980b4872ee43157c6621896e84e817c9aeab

commit 65ca980b4872ee43157c6621896e84e817c9aeab
Author: Alin Nastac <alin.nastac at technicolor.com>
AuthorDate: Mon Mar 1 09:49:43 2021 +0100

    vti: use alternative way to check if kernel support is enabled
    
    When necessary support is built in kernel, vti protocol support is
    not enabled in netifd.
    
    Signed-off-by: Alin Nastac <alin.nastac at technicolor.com>
---
 package/network/config/vti/Makefile     | 2 +-
 package/network/config/vti/files/vti.sh | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package/network/config/vti/Makefile b/package/network/config/vti/Makefile
index ffac77ab91..292ab111e5 100644
--- a/package/network/config/vti/Makefile
+++ b/package/network/config/vti/Makefile
@@ -8,7 +8,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=vti
-PKG_RELEASE:=3
+PKG_RELEASE:=4
 PKG_LICENSE:=GPL-2.0
 
 include $(INCLUDE_DIR)/package.mk
diff --git a/package/network/config/vti/files/vti.sh b/package/network/config/vti/files/vti.sh
index ebfd9d41e1..96b65e76d9 100755
--- a/package/network/config/vti/files/vti.sh
+++ b/package/network/config/vti/files/vti.sh
@@ -149,6 +149,6 @@ proto_vti6_init_config() {
 }
 
 [ -n "$INCLUDE_ONLY" ] || {
-	[ -f /lib/modules/$(uname -r)/ip_vti.ko ] && add_protocol vti
-	[ -f /lib/modules/$(uname -r)/ip6_vti.ko ] && add_protocol vti6
+	[ -d /sys/module/ip_vti ] && add_protocol vti
+	[ -d /sys/module/ip6_vti ] && add_protocol vti6
 }



More information about the lede-commits mailing list