[PATCH v2 1/2] fff-wireless: Also use wXmesh label for wXibss

[Adrian Schmutzler]

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 at adrianschmutzler.de>

---

Changes in v2:
- none
---
 src/packages/fff/fff-hoods/Makefile                            | 3 +--
 src/packages/fff/fff-hoods/files/usr/sbin/configurehood        | 2 +-
 src/packages/fff/fff-wireless/Makefile                         | 2 +-
 src/packages/fff/fff-wireless/files/lib/functions/fff/wireless | 4 ++--
 4 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/packages/fff/fff-hoods/Makefile b/src/packages/fff/fff-hoods/Makefile
index f1a62896..9d0e6786 100644
--- a/src/packages/fff/fff-hoods/Makefile
+++ b/src/packages/fff/fff-hoods/Makefile
@@ -1,8 +1,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=fff-hoods
-PKG_VERSION:=5
-PKG_RELEASE:=1
+PKG_RELEASE:=6
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)
 
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/Makefile b/src/packages/fff/fff-wireless/Makefile
index 6c0b6a9b..9b7b4d3f 100644
--- a/src/packages/fff/fff-wireless/Makefile
+++ b/src/packages/fff/fff-wireless/Makefile
@@ -1,7 +1,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=fff-wireless
-PKG_RELEASE:=8
+PKG_RELEASE:=9
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)
 
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 2473e09a..71a07f93 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__
-- 
2.11.0