From 92445cc982cff614c6c4bfd4cff869d803211a50 Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Thu, 13 Nov 2025 12:41:30 +0000 Subject: [PATCH] wifi-scripts: respect rsn_override=0 in mixed modes MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Only set rsn_override_key_mgmt when rsn_override is enabled. Reported-by: Michael-cy Lee (李峻宇) Signed-off-by: Felix Fietkau --- .../files-ucode/usr/share/ucode/wifi/iface.uc | 15 ++++++++++----- 1 file 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; -- 2.30.2