Resneptacle/openwrt-cghmn-mt300n
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

wpa_supplicant: fix num_global_macaddr handling

Browse Source 
Pass num_global_macaddr via ubus in the top level config_set call

Signed-off-by: Felix Fietkau <nbd@nbd.name>
This commit is contained in:
Felix Fietkau 2024-09-21 20:30:01 +02:00
parent b4e7682c54
commit 81a48e7d1a
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
package/network/config/wifi-scripts/files/lib/netifd/wireless/mac80211.sh
View File

@ -896,6 +896,7 @@ wpa_supplicant_set_config() {
json_set_namespace wpa_supp prev json_set_namespace wpa_supp prev
json_close_array json_close_array
json_add_string phy "$phy" json_add_string phy "$phy"
json_add_int num_global_macaddr "$num_global_macaddr"
json_add_boolean defer 1 json_add_boolean defer 1
local data="$(json_dump)" local data="$(json_dump)"
@ -938,7 +939,7 @@ wpa_supplicant_start() {
[ -n "$wpa_supp_init" ] || return 0 [ -n "$wpa_supp_init" ] || return 0
ubus_call wpa_supplicant config_set '{ "phy": "'"$phy"'" }' > /dev/null ubus_call wpa_supplicant config_set '{ "phy": "'"$phy"'", "num_global_macaddr": '"$num_global_macaddr"' }' > /dev/null
} }
mac80211_setup_supplicant() { mac80211_setup_supplicant() {

9
package/network/services/hostapd/files/wpa_supplicant.uc
View File

@ -68,7 +68,7 @@ function prepare_config(config)
return { config: config }; return { config: config };
} }
function set_config(phy_name, config_list) function set_config(phy_name, num_global_macaddr, config_list)
{ {
let phy = wpas.data.config[phy_name]; let phy = wpas.data.config[phy_name];
@ -77,6 +77,8 @@ function set_config(phy_name, config_list)
wpas.data.config[phy_name] = phy; wpas.data.config[phy_name] = phy;
} }
phy.num_global_macaddr = num_global_macaddr;
let values = []; let values = [];
for (let config in config_list) for (let config in config_list)
push(values, [ config.iface, prepare_config(config) ]); push(values, [ config.iface, prepare_config(config) ]);
@ -99,7 +101,7 @@ function start_pending(phy_name)
} }
let macaddr_list = wpas.data.macaddr_list[phy_name]; let macaddr_list = wpas.data.macaddr_list[phy_name];
phydev.macaddr_init(macaddr_list); phydev.macaddr_init(macaddr_list, { num_global: phy.num_global_macaddr });
for (let ifname in phy.data) for (let ifname in phy.data)
iface_start(phydev, phy.data[ifname]); iface_start(phydev, phy.data[ifname]);
@ -185,6 +187,7 @@ let main_obj = {
config_set: { config_set: {
args: { args: {
phy: "", phy: "",
num_global_macaddr: 0,
config: [], config: [],
defer: true, defer: true,
}, },
@ -195,7 +198,7 @@ let main_obj = {
wpas.printf(`Set new config for phy ${req.args.phy}`); wpas.printf(`Set new config for phy ${req.args.phy}`);
try { try {
if (req.args.config) if (req.args.config)
set_config(req.args.phy, req.args.config); set_config(req.args.phy, req.args.num_global_macaddr, req.args.config);
if (!req.args.defer) if (!req.args.defer)
start_pending(req.args.phy); start_pending(req.args.phy);