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

Required for Profile-2 support.

Signed-off-by: Felix Fietkau <[email protected]>

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 b2e718148972763658b0ee57eaabace15e5131ba..6cfc515460172c3754f8fd09199a1129b9afc7d9 100644 (file)
--- 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 f18f2f0d3c95d560d082b56d255ef8f00206ad07..6c2309e626f27d09c44f0a63fffca8f1cbb2219b 100644 (file)
--- 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 3ef150694f7c91ac66cf0bf17868e8d4842e7908..c948b92adb926a0e4c89856df5c4eb909596e41b 100644 (file)
--- 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',