diff options
| author | Felix Fietkau | 2025-11-13 12:41:30 +0000 |
|---|---|---|
| committer | Felix Fietkau | 2025-11-13 12:41:42 +0000 |
| commit | 92445cc982cff614c6c4bfd4cff869d803211a50 (patch) | |
| tree | e423f07c80c04ec586ec1a07b5f3ab9003bfd677 | |
| parent | ff44aa490a85c57fa0cc81873085104052b61e99 (diff) | |
| download | openwrt-92445cc982cff614c6c4bfd4cff869d803211a50.tar.gz | |
wifi-scripts: respect rsn_override=0 in mixed modes
Only set rsn_override_key_mgmt when rsn_override is enabled.
Reported-by: Michael-cy Lee (李峻宇) <Michael-cy.Lee@mediatek.com>
Signed-off-by: Felix Fietkau <nbd@nbd.name>
| -rw-r--r-- | package/network/config/wifi-scripts/files-ucode/usr/share/ucode/wifi/iface.uc | 15 |
1 files changed, 10 insertions, 5 deletions
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 fc78bfe36f..916305e183 100644 --- 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 @@ -153,7 +153,9 @@ export function wpa_key_mgmt(config) { if (config.ieee80211r) append_value(config, 'wpa_key_mgmt', 'FT-EAP'); - config.rsn_override_key_mgmt = config.wpa_key_mgmt; + if (config.rsn_override) + config.rsn_override_key_mgmt = config.wpa_key_mgmt; + append_value(config, 'wpa_key_mgmt', 'WPA-EAP'); break; @@ -173,11 +175,14 @@ export function wpa_key_mgmt(config) { append_value(config, 'wpa_key_mgmt', 'SAE'); 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) { + 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; |