aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlin Nastac <alin.nastac@gmail.com>2021-02-23 13:05:09 +0100
committerHans Dedecker <dedeckeh@gmail.com>2021-03-13 20:58:55 +0100
commit8a35ebe375d1c27e55dd2cb8c14f25440bc48821 (patch)
treea8a2baf5ddd4282857af28d5362554d5fdc88a42
parent1cd098784eeb0e3ba0d05cd3e71ebf1a106138e9 (diff)
downloadupstream-8a35ebe375d1c27e55dd2cb8c14f25440bc48821.tar.gz
upstream-8a35ebe375d1c27e55dd2cb8c14f25440bc48821.tar.bz2
upstream-8a35ebe375d1c27e55dd2cb8c14f25440bc48821.zip
gre: use alternative way to check if kernel support is enabled
When necessary support is built in kernel, gre protocol support is not enabled in netifd. Signed-off-by: Alin Nastac <alin.nastac@gmail.com>
-rw-r--r--package/network/config/gre/Makefile2
-rwxr-xr-xpackage/network/config/gre/files/gre.sh6
2 files changed, 3 insertions, 5 deletions
diff --git a/package/network/config/gre/Makefile b/package/network/config/gre/Makefile
index b16dd72cde..c920abeb0d 100644
--- a/package/network/config/gre/Makefile
+++ b/package/network/config/gre/Makefile
@@ -8,7 +8,7 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=gre
-PKG_RELEASE:=12
+PKG_RELEASE:=13
PKG_LICENSE:=GPL-2.0
include $(INCLUDE_DIR)/package.mk
diff --git a/package/network/config/gre/files/gre.sh b/package/network/config/gre/files/gre.sh
index eb3df5b48c..b57d5d4cdb 100755
--- a/package/network/config/gre/files/gre.sh
+++ b/package/network/config/gre/files/gre.sh
@@ -291,8 +291,6 @@ proto_grev6tap_init_config() {
}
[ -n "$INCLUDE_ONLY" ] || {
- [ -f /lib/modules/$(uname -r)/gre.ko ] && add_protocol gre
- [ -f /lib/modules/$(uname -r)/gre.ko ] && add_protocol gretap
- [ -f /lib/modules/$(uname -r)/ip6_gre.ko ] && add_protocol grev6
- [ -f /lib/modules/$(uname -r)/ip6_gre.ko ] && add_protocol grev6tap
+ [ -d /sys/module/ip_gre ] && { add_protocol gre; add_protocol gretap; }
+ [ -d /sys/module/ip6_gre ] && { add_protocol grev6; add_protocol grev6tap; }
}