From 22d9f905284b98b56001adc47558c739dd773393 Mon Sep 17 00:00:00 2001
From: Vivek Kumar Dutta <vivek.dutta@iopsys.eu>
Date: Mon, 19 May 2025 17:43:01 +0530
Subject: [PATCH] netmode: fix extender configuration

---
 netmode/Makefile                                          | 2 +-
 .../netmode/pre => etc/uci-defaults}/62-netmode.l2mode    | 8 ++------
 netmode/files/lib/netmode/pre/.keep                       | 0
 3 files changed, 3 insertions(+), 7 deletions(-)
 rename netmode/files/{lib/netmode/pre => etc/uci-defaults}/62-netmode.l2mode (95%)
 create mode 100644 netmode/files/lib/netmode/pre/.keep

diff --git a/netmode/Makefile b/netmode/Makefile
index 265d02a46..68d229c1b 100644
--- a/netmode/Makefile
+++ b/netmode/Makefile
@@ -8,7 +8,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=netmode
-PKG_VERSION:=1.1.0
+PKG_VERSION:=1.1.1
 PKG_RELEASE:=1
 PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_LICENSE:=GPL-2.0-only
diff --git a/netmode/files/lib/netmode/pre/62-netmode.l2mode b/netmode/files/etc/uci-defaults/62-netmode.l2mode
similarity index 95%
rename from netmode/files/lib/netmode/pre/62-netmode.l2mode
rename to netmode/files/etc/uci-defaults/62-netmode.l2mode
index 7cae2f6fe..2edf7622f 100755
--- a/netmode/files/lib/netmode/pre/62-netmode.l2mode
+++ b/netmode/files/etc/uci-defaults/62-netmode.l2mode
@@ -108,14 +108,10 @@ l2_network_config() {
 	uci -q commit firewall
 }
 
-network_mode="$(uci -q get netmode.global.mode)"
-
-if [ -z "${network_mode}" ]; then
-	network_mode="$(fw_printenv -n netmode 2>/dev/null)"
-fi
+network_mode="$(fw_printenv -n netmode 2>/dev/null)"
 
 case "$network_mode" in
-	layer2|extender|bridged)
+	layer2|extender)
 		l2_network_config
 		l2_mcast_config
 	;;	
diff --git a/netmode/files/lib/netmode/pre/.keep b/netmode/files/lib/netmode/pre/.keep
new file mode 100644
index 000000000..e69de29bb