From 464f037768340e751c80b0cef441aa070e3801a0 Mon Sep 17 00:00:00 2001
From: Marina Maslova <Marina.Maslova@iopsys.eu>
Date: Wed, 30 Oct 2024 17:50:23 +0400
Subject: [PATCH] map-agent: add fixed interface names for proprietary mediatek
 driver

---
 map-agent/files/lib/multiap/map_genconfig | 43 ++++++++++++++++++++---
 1 file changed, 39 insertions(+), 4 deletions(-)

diff --git a/map-agent/files/lib/multiap/map_genconfig b/map-agent/files/lib/multiap/map_genconfig
index eed0296a2..30fa17f78 100644
--- a/map-agent/files/lib/multiap/map_genconfig
+++ b/map-agent/files/lib/multiap/map_genconfig
@@ -65,10 +65,40 @@ generate_multiap_config() {
 
 		device="$dev"
 
+		ifprefix_radio=""
 		if is_airoha; then
-			ifprefix="wlan%_%"
-			ifname="wlan${devidx}_0"
-			ifname_bh="wlan${devidx}_1"
+			if [ -d "/sys/module/mt76" ]; then
+				ifprefix="wlan%_%"
+				ifname="wlan${devidx}_0"
+				ifname_bh="wlan${devidx}_1"
+			else
+				ifname_sta=""
+				case "$band" in
+					2g)
+						ifprefix="ra%"
+						ifname="ra0"
+						ifname_bh="ra1"
+						ifname_sta="apcli0"
+					;;
+					5g)
+						ifprefix="rai%"
+						ifname="rai0"
+						ifname_bh="rai1"
+						ifname_sta="apclii0"
+					;;
+					6g)
+						ifprefix="rax%"
+						ifname="rax0"
+						ifname_bh="rax1"
+						ifname_sta="apclix0"
+					;;
+				esac
+				ifprefix_radio="${ifprefix}"
+				if [ "${network_mode}" == "extender" ]; then
+					ifname="${ifname_sta}"
+				fi
+			fi
+
 			uci set wireless.$dev.channels="$channels"
 			uci commit wireless
 		elif is_broadcom; then
@@ -99,12 +129,17 @@ generate_multiap_config() {
 		fi
 
 		if [ $generate_mapagent_config -eq 1 ]; then
-			uci set mapagent.agent.ifprefix="$ifprefix"
+			if [ -z "${ifprefix_radio}" ]; then
+				uci set mapagent.agent.ifprefix="$ifprefix"
+			fi
 			uci set mapagent.agent.brcm_setup="$brcm_setup"
 			uci set mapagent.agent.ap_follow_sta_dfs="$ap_follow_sta_dfs"
 			uci add mapagent radio
 			uci set mapagent.@radio[-1].device="$device"
 			uci set mapagent.@radio[-1].band="$mode_band"
+			if [ -n "${ifprefix_radio}" ]; then
+				uci set mapagent.@radio[-1].ifprefix="${ifprefix}"
+			fi
 
 			if [ "$network_mode" == "extender" ]; then
 				uci add mapagent bsta