From 7b0e49753ea9cbb054a38fbe6867fa0fc30830f3 Mon Sep 17 00:00:00 2001
From: Jakob Olsson <jakob.olsson@iopsys.eu>
Date: Thu, 23 May 2024 16:36:52 +0200
Subject: [PATCH] map-controller: config: handle mld and non-mld ap in same
 section

---
 map-controller/files/etc/config/mapcontroller | 43 +++++++------------
 1 file changed, 15 insertions(+), 28 deletions(-)

diff --git a/map-controller/files/etc/config/mapcontroller b/map-controller/files/etc/config/mapcontroller
index a81af29e0..445046ac1 100644
--- a/map-controller/files/etc/config/mapcontroller
+++ b/map-controller/files/etc/config/mapcontroller
@@ -40,6 +40,7 @@ config ap
 	option key '$WIFI_FH_KEY'
 	option vid '1'
 	option type 'fronthaul'
+	option mld_id '1'
 
 config ap
 	option band '5'
@@ -48,6 +49,7 @@ config ap
 	option key '$WIFI_FH_KEY'
 	option vid '1'
 	option type 'fronthaul'
+	option mld_id '1'
 
 config ap
 	option band '6'
@@ -56,6 +58,7 @@ config ap
 	option key '$WIFI_FH_KEY'
 	option vid '1'
 	option type 'fronthaul'
+	option mld_id '1'
 
 config ap
 	option band '2'
@@ -64,6 +67,7 @@ config ap
 	option key '$WIFI_BH_KEY'
 	option type 'backhaul'
 	option vid '1'
+	option mld_id '2'
 
 config ap
 	option band '5'
@@ -72,6 +76,7 @@ config ap
 	option key '$WIFI_BH_KEY'
 	option type 'backhaul'
 	option vid '1'
+	option mld_id '2'
 
 config ap
 	option band '6'
@@ -80,42 +85,24 @@ config ap
 	option key '$WIFI_BH_KEY'
 	option type 'backhaul'
 	option vid '1'
-
-config ap
-	option band '2'
-	option ssid '$DEVICE_MANUFACTURER-$BASEMAC_ADDR-2.4GHz-MLDlink'
-	option encryption 'sae-mixed'
-	option key '$WIFI_FH_KEY'
-	option vid '1'
-	option type 'fronthaul'
-	option mld_id '1'
-
-config ap
-	option band '5'
-	option ssid '$DEVICE_MANUFACTURER-$BASEMAC_ADDR-5GHz-MLDlink'
-	option encryption 'sae-mixed'
-	option key '$WIFI_FH_KEY'
-	option vid '1'
-	option type 'fronthaul'
-	option mld_id '1'
-
-config ap
-	option band '6'
-	option ssid '$DEVICE_MANUFACTURER-$BASEMAC_ADDR-6GHz-MLDlink'
-	option encryption 'sae'
-	option key '$WIFI_FH_KEY'
-	option vid '1'
-	option type 'fronthaul'
-	option mld_id '1'
+	option mld_id '2'
 
 config mld
 	option id '1'
-	option ssid 'MAP-$BASEMAC_ADDR-MLD'
+	option ssid '$DEVICE_MANUFACTURER-$BASEMAC_ADDR'
 	option encryption 'sae'
 	option key '$WIFI_FH_KEY'
 #	option vid '1'
 	option type 'fronthaul'
 
+config mld
+	option id '2'
+	option ssid 'MAP-$BASEMAC_ADDR-BH'
+	option encryption 'sae'
+	option key '$WIFI_BH_KEY'
+#	option vid '1'
+	option type 'backhaul'
+
 # node and radio sections (per node) are auto
 # generated per Multi-AP Agent in the network
 #