ExternalVendorCode/openwrt
1
0
Fork 0
mirror of https://github.com/openwrt/openwrt.git synced 2025-02-20 09:26:28 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

hostapd: fix num_global_macaddr and mbssid config handling

Browse Source 
Store the config values in the correct field and apply them on restart too

Signed-off-by: Felix Fietkau <nbd@nbd.name>
This commit is contained in:
Felix Fietkau 2024-09-21 20:13:51 +02:00
parent 1a288670d9
commit b4e7682c54
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
package/network/services/hostapd/files/hostapd.uc
View File

@ -229,6 +229,16 @@ function iface_pending_init(phydev, config)
pending.next(); pending.next();
} }
function iface_macaddr_init(phydev, config, macaddr_list)
{
let macaddr_data = {
num_global: config.num_global_macaddr ?? 1,
mbssid: config.mbssid ?? 0,
};
return phydev.macaddr_init(macaddr_list, macaddr_data);
}
function iface_restart(phydev, config, old_config) function iface_restart(phydev, config, old_config)
{ {
let phy = phydev.name; let phy = phydev.name;
@ -246,7 +256,7 @@ function iface_restart(phydev, config, old_config)
return; return;
} }
phydev.macaddr_init(iface_config_macaddr_list(config)); iface_macaddr_init(phydev, config, iface_config_macaddr_list(config));
for (let i = 0; i < length(config.bss); i++) { for (let i = 0; i < length(config.bss); i++) {
let bss = config.bss[i]; let bss = config.bss[i];
if (bss.default_macaddr) if (bss.default_macaddr)
@ -500,11 +510,7 @@ function iface_reload_config(phydev, config, old_config)
} }
// Step 6: assign BSSID for newly created interfaces // Step 6: assign BSSID for newly created interfaces
let macaddr_data = { macaddr_list = iface_macaddr_init(phydev, config, macaddr_list);
num_global: config.num_global_macaddr ?? 1,
mbssid: config.mbssid ?? 0,
};
macaddr_list = phydev.macaddr_init(macaddr_list, macaddr_data);
for (let i = 0; i < length(config.bss); i++) { for (let i = 0; i < length(config.bss); i++) {
if (bss_list[i]) if (bss_list[i])
continue; continue;
@ -675,7 +681,7 @@ function iface_load_config(filename)
if (val[0] == "#num_global_macaddr" || if (val[0] == "#num_global_macaddr" ||
val[0] == "mbssid") val[0] == "mbssid")
config[val[0]] = int(val[1]); config[substr(val[0], 1)] = int(val[1]);
push(config.radio.data, line); push(config.radio.data, line);
} }