From 8a1eb6d4c847da58fb6c4f134c6293df741d261d Mon Sep 17 00:00:00 2001
From: Adrian Schmutzler <freifunk@adrianschmutzler.de>
Date: Sun, 16 Jun 2019 16:23:23 +0200
Subject: [PATCH] fff-wireless: Also use wXmesh label for wXibss
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
The two different names "wXmesh" and "wXibss" have no functional
purpose and are just for indication. Remove this distinction, so
mesh is just mesh.
This will make further adjustment easier and clearer.
Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
Reviewed-by: Fabian Bläse <fabian@blaese.de>
---
src/packages/fff/fff-hoods/files/usr/sbin/configurehood | 2 +-
.../fff/fff-wireless/files/lib/functions/fff/wireless | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/packages/fff/fff-hoods/files/usr/sbin/configurehood b/src/packages/fff/fff-hoods/files/usr/sbin/configurehood
index e84f2bcb..0df41887 100755
--- a/src/packages/fff/fff-hoods/files/usr/sbin/configurehood
+++ b/src/packages/fff/fff-hoods/files/usr/sbin/configurehood
@@ -54,7 +54,7 @@ if [ -s "$hoodfilewww" ] && isGatewayAvailable ; then
# Break: wXconfig is up
uci -q get "wireless.w${freq}configap" > /dev/null && continue
# Break: No mesh interface
- (uci -q get "wireless.w${freq}mesh" > /dev/null || uci -q get "wireless.w${freq}ibss" > /dev/null) || continue
+ uci -q get "wireless.w${freq}mesh" > /dev/null || continue
# Create configap
iface="configap$freq"
diff --git a/src/packages/fff/fff-wireless/files/lib/functions/fff/wireless b/src/packages/fff/fff-wireless/files/lib/functions/fff/wireless
index 0b3597b6..ae16d2d2 100644
--- a/src/packages/fff/fff-wireless/files/lib/functions/fff/wireless
+++ b/src/packages/fff/fff-wireless/files/lib/functions/fff/wireless
@@ -100,9 +100,9 @@ wifiAddAdHocMesh() {
local bssid=$3
local channel=$(uci get "wireless.${radio}.channel")
- local iface="w2ibss"
+ local iface="w2mesh"
if [ "$channel" -gt "14" ]; then
- iface="w5ibss"
+ iface="w5mesh"
fi
uci batch <<-__EOF__
--
GitLab