From: Felix Fietkau <nbd@nbd.name>
Date: Fri, 13 Dec 2024 09:56:50 +0000 (+0100)
Subject: wifi-scripts: fix mesh/sta setup with ucode scripts
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=b6c7d8a0d60fddd162c77371e2500f485339e2c7;p=openwrt%2Fstaging%2Fwigyori.git

wifi-scripts: fix mesh/sta setup with ucode scripts

Ensure that the code doesn't pass macaddr_base with the wrong type (null)
to the supplicant setup/start call.

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

diff --git a/package/network/config/wifi-scripts/files-ucode/usr/share/ucode/wifi/supplicant.uc b/package/network/config/wifi-scripts/files-ucode/usr/share/ucode/wifi/supplicant.uc
index c7bfeb6b9a..2942767f0b 100644
--- a/package/network/config/wifi-scripts/files-ucode/usr/share/ucode/wifi/supplicant.uc
+++ b/package/network/config/wifi-scripts/files-ucode/usr/share/ucode/wifi/supplicant.uc
@@ -221,7 +221,7 @@ export function setup(config, data) {
 		config,
 		defer: true,
 		num_global_macaddr: data.config.num_global_macaddr,
-		macaddr_base: data.config.macaddr_base,
+		macaddr_base: data.config.macaddr_base ?? "",
 	});
 
 	if (ret)
@@ -236,6 +236,6 @@ export function start(data) {
 		phy: data.phy,
 		radio: data.config.radio,
 		num_global_macaddr: data.config.num_global_macaddr,
-		macaddr_base: data.config.macaddr_base,
+		macaddr_base: data.config.macaddr_base ?? "",
 	});
 };