wifi-scripts: ucode: add extra RSN override for MLO

Use SAE-EXT-KEY instead of SAE for MLO clients

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

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 8296f01195bb02d213c36f67c59f03c47c789387..16a2c67afeace63e11508b2aa70a7d1dfd70b5ef 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
@@ -482,6 +482,18 @@ export function generate(interface, data, config, vlans, stas, phy_features) {
                        'rsn_override_pairwise',
                        'rsn_override_mfp'
                ]);
+
+               if (config.mode == 'link') {
+                       config.rsn_override_mfp_2 ??= config.rsn_override_mfp;
+                       config.rsn_override_key_mgmt_2 ??= config.rsn_override_key_mgmt;
+                       config.rsn_override_pairwise_2 ??= config.rsn_override_pairwise;
+
+                       append_vars(config, [
+                               'rsn_override_key_mgmt_2',
+                               'rsn_override_pairwise_2',
+                               'rsn_override_mfp_2'
+                       ]);
+               }
        }
 
        /* raw options */

diff --git a/package/network/config/wifi-scripts/files-ucode/usr/share/ucode/wifi/iface.uc b/package/network/config/wifi-scripts/files-ucode/usr/share/ucode/wifi/iface.uc
index bfea26d462a786661806d2b1dd04993041c525b8..4a592bc99f31de174b25e62a47cfbc376207e82b 100644 (file)
--- a/package/network/config/wifi-scripts/files-ucode/usr/share/ucode/wifi/iface.uc
+++ b/package/network/config/wifi-scripts/files-ucode/usr/share/ucode/wifi/iface.uc
@@ -174,6 +174,11 @@ export function wpa_key_mgmt(config) {
                if (config.ieee80211r)
                        append_value(config, 'wpa_key_mgmt', 'FT-SAE');
                config.rsn_override_key_mgmt = config.wpa_key_mgmt;
+
+               append_value(config, 'rsn_override_key_mgmt_2', 'SAE-EXT-KEY');
+               if (config.ieee80211r)
+                       append_value(config, 'rsn_override_key_mgmt_2', 'FT-SAE-EXT-KEY');
+
                if (config.rsn_override > 1)
                        delete config.wpa_key_mgmt;