From: Felix Fietkau <nbd@nbd.name>
Date: Wed, 1 Oct 2025 08:02:37 +0000 (+0200)
Subject: wifi-scripts: ucode: add support for setting Multi-AP profile/vlanid
X-Git-Url: http://git.openwrt.org/?a=commitdiff_plain;h=3d8d525b212ce580ebcafd46f94eeb28898abd30;p=openwrt%2Fstaging%2Fnbd.git

wifi-scripts: ucode: add support for setting Multi-AP profile/vlanid

Required for Profile-2 support.

Signed-off-by: Felix Fietkau <nbd@nbd.name>
---

diff --git a/package/network/config/wifi-scripts/files-ucode/usr/share/schema/wireless.wifi-iface.json b/package/network/config/wifi-scripts/files-ucode/usr/share/schema/wireless.wifi-iface.json
index b2e7181489..6cfc515460 100644
--- a/package/network/config/wifi-scripts/files-ucode/usr/share/schema/wireless.wifi-iface.json
+++ b/package/network/config/wifi-scripts/files-ucode/usr/share/schema/wireless.wifi-iface.json
@@ -704,6 +704,14 @@
 			"description": "Enable Multi-AP functionality",
 			"type": "number"
 		},
+		"multi_ap_vlanid": {
+			"description": "Multi-AP Default VLAN ID",
+			"type": "number"
+		},
+		"multi_ap_profile": {
+			"description": "Multi-AP Profile",
+			"type": "number"
+		},
 		"multi_ap_backhaul_key": {
 			"type": "string"
 		},
diff --git a/package/network/config/wifi-scripts/files-ucode/usr/share/ucode/wifi/ap.uc b/package/network/config/wifi-scripts/files-ucode/usr/share/ucode/wifi/ap.uc
index f18f2f0d3c..6c2309e626 100644
--- a/package/network/config/wifi-scripts/files-ucode/usr/share/ucode/wifi/ap.uc
+++ b/package/network/config/wifi-scripts/files-ucode/usr/share/ucode/wifi/ap.uc
@@ -52,8 +52,8 @@ function iface_setup(config) {
 		'ctrl_interface', 'ap_isolate', 'max_num_sta', 'ap_max_inactivity', 'airtime_bss_weight',
 		'airtime_bss_limit', 'airtime_sta_weight', 'bss_load_update_period', 'chan_util_avg_period',
 		'disassoc_low_ack', 'skip_inactivity_poll', 'ignore_broadcast_ssid', 'uapsd_advertisement_enabled',
-		'utf8_ssid', 'multi_ap', 'tdls_prohibit', 'bridge', 'wds_sta', 'wds_bridge',
-		'snoop_iface', 'vendor_elements', 'nas_identifier', 'radius_acct_interim_interval',
+		'utf8_ssid', 'multi_ap', 'multi_ap_vlanid', 'multi_ap_profile', 'tdls_prohibit', 'bridge',
+		'wds_sta', 'wds_bridge', 'snoop_iface', 'vendor_elements', 'nas_identifier', 'radius_acct_interim_interval',
 		'ocv', 'multicast_to_unicast', 'preamble', 'proxy_arp', 'per_sta_vif', 'mbo',
 		'bss_transition', 'wnm_sleep_mode', 'wnm_sleep_mode_no_keys', 'qos_map_set', 'max_listen_int',
 		'dtim_period', 'wmm_enabled', 'start_disabled',
diff --git a/package/network/config/wifi-scripts/files-ucode/usr/share/ucode/wifi/supplicant.uc b/package/network/config/wifi-scripts/files-ucode/usr/share/ucode/wifi/supplicant.uc
index 3ef150694f..c948b92adb 100644
--- a/package/network/config/wifi-scripts/files-ucode/usr/share/ucode/wifi/supplicant.uc
+++ b/package/network/config/wifi-scripts/files-ucode/usr/share/ucode/wifi/supplicant.uc
@@ -71,6 +71,7 @@ function setup_sta(data, config) {
 	set_default(config, 'ieee80211r', 0);
 	set_default(config, 'sae_pwe', 2);
 	set_default(config, 'multi_ap', 0);
+	set_default(config, 'multi_profile', 1);
 	set_default(config, 'default_disabled', 0);
 
 	config.scan_ssid = 1;
@@ -170,7 +171,7 @@ function setup_sta(data, config) {
 
 	network_append_string_vars(config, [ 'ssid' ]);
 	network_append_vars(config, [
-		'rsn_overriding', 'scan_ssid', 'noscan', 'disabled', 'multi_ap_backhaul_sta',
+		'rsn_overriding', 'scan_ssid', 'noscan', 'disabled', 'multi_ap_profile', 'multi_ap_backhaul_sta',
 		'ocv', 'key_mgmt', 'sae_pwe', 'psk', 'sae_password', 'pairwise', 'group', 'bssid',
 		'proto', 'mesh_fwding', 'mesh_rssi_threshold', 'frequency', 'fixed_freq',
 		'disable_ht', 'disable_ht40', 'disable_vht', 'vht', 'max_oper_chwidth',