[openwrt/openwrt] wifi-scripts: respect rsn_override=0 in mixed modes

LEDE Commits lede-commits at lists.infradead.org
Thu Nov 13 04:55:53 PST 2025


nbd pushed a commit to openwrt/openwrt.git, branch main:
https://git.openwrt.org/92445cc982cff614c6c4bfd4cff869d803211a50

commit 92445cc982cff614c6c4bfd4cff869d803211a50
Author: Felix Fietkau <nbd at nbd.name>
AuthorDate: Thu Nov 13 12:41:30 2025 +0000

    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 at mediatek.com>
    Signed-off-by: Felix Fietkau <nbd at nbd.name>
---
 .../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;




More information about the lede-commits mailing list