[openwrt/openwrt] wifi-scripts: ucode: fix parsing of legacy hwmode option

LEDE Commits lede-commits at lists.infradead.org
Wed Dec 11 06:43:43 PST 2024


blogic pushed a commit to openwrt/openwrt.git, branch main:
https://git.openwrt.org/3ab1a69339cf2f98046480474be712e18919b6db

commit 3ab1a69339cf2f98046480474be712e18919b6db
Author: John Crispin <john at phrozen.org>
AuthorDate: Wed Dec 11 12:02:18 2024 +0100

    wifi-scripts: ucode: fix parsing of legacy hwmode option
    
    Signed-off-by: John Crispin <john at phrozen.org>
---
 .../config/wifi-scripts/files-ucode/usr/share/ucode/wifi/hostapd.uc   | 4 ++--
 .../config/wifi-scripts/files-ucode/usr/share/ucode/wifi/iface.uc     | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package/network/config/wifi-scripts/files-ucode/usr/share/ucode/wifi/hostapd.uc b/package/network/config/wifi-scripts/files-ucode/usr/share/ucode/wifi/hostapd.uc
index f7eaa2741d..c7baa8d85b 100644
--- a/package/network/config/wifi-scripts/files-ucode/usr/share/ucode/wifi/hostapd.uc
+++ b/package/network/config/wifi-scripts/files-ucode/usr/share/ucode/wifi/hostapd.uc
@@ -17,8 +17,8 @@ let phy_capabilities = {};
 /* make sure old style UCI and hwmode and newer band properties are correctly resolved */
 function set_device_defaults(config) {
 	/* validate the hw mode */
-	if (config.hwmode in [ '11a', '11b', '11g', '11ad' ])
-		config.hw_mode = substr(config.hwmode, 2);
+	if (config.hw_mode in [ '11a', '11b', '11g', '11ad' ])
+		config.hw_mode = substr(config.hw_mode, 2);
 	else if (config.channel > 14)
 		config.hw_mode = 'a';
 	else
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 69805a4b6f..daddb801ef 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
@@ -6,7 +6,7 @@ import * as fs from 'fs';
 export function parse_encryption(config) {
 	let encryption = split(config.encryption, '+', 2);
 
-	config.wpa_pairwise = (config.hwmode == 'ad') ? 'GCMP' : 'CCMP';
+	config.wpa_pairwise = (config.hw_mode == 'ad') ? 'GCMP' : 'CCMP';
 
 	switch(encryption[1]){
 	case 'tkip+aes':




More information about the lede-commits mailing list