From 84b5e3bb4dc91ab548e8f25a11ee35a830948b40 Mon Sep 17 00:00:00 2001
From: Janusz Dziedzic <janusz.dziedzic@iopsys.eu>
Date: Fri, 18 Jul 2025 06:44:59 +0000
Subject: [PATCH] map-dynamic-backhaul: dedicated wan port update

Don't require wan port to be added as a bridge
port in UCI default config.
---
 .../etc/hotplug.d/ethernet/map-dynamic-backhaul     | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/map-agent/files/etc/hotplug.d/ethernet/map-dynamic-backhaul b/map-agent/files/etc/hotplug.d/ethernet/map-dynamic-backhaul
index 381c8e342..fcca8ed74 100755
--- a/map-agent/files/etc/hotplug.d/ethernet/map-dynamic-backhaul
+++ b/map-agent/files/etc/hotplug.d/ethernet/map-dynamic-backhaul
@@ -17,12 +17,6 @@ for port_bridge_sec in $port_bridge_sec_list; do
 	fi
 done
 
-# Exit if the PORT Bridge Name is empty
-[ -z "$port_bridge_name" ]  && exit 0
-
-# Exit if the PORT is not member of the AL Bridge
-[ "$port_bridge_name" = "$al_bridge" ] || exit 0
-
 # Exit if the device is not operating in extender/repeater mode
 al_brnet="${al_bridge:3}"
 [ "$(uci -q get network.${al_brnet}.proto)" == "dhcp" ] || exit 0
@@ -36,9 +30,16 @@ fi
 ################ Dedicated ETH WAN Port ################
 wanport="$(jsonfilter -i /etc/board.json -e @.network.wan.device)"
 if [ -n "$wanport" ]; then
+	# Don't require wanport to be part of port bridge
 	[ "$wanport" = "$PORT" ] || exit 0
 ########################################################
 else
+	# Exit if the PORT Bridge Name is empty
+	[ -z "$port_bridge_name" ]  && exit 0
+
+	# Exit if the PORT is not member of the AL Bridge
+	[ "$port_bridge_name" = "$al_bridge" ] || exit 0
+
 #################### DHCP Discovery ####################
 	if [ "$LINK" = "up" ]; then
 		brctl delif $al_bridge $PORT