scottk/wlan-ap
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/wlan-ap.git synced 2025-11-03 11:57:58 +00:00
Code Issues Packages Projects Releases 10 Wiki Activity

wifi-ax: backport hostapd reload support - fixes

Browse Source 
Signed-off-by: Felix Fietkau <nbd@nbd.name>
This commit is contained in:
John Crispin
2023-07-11 11:41:38 +02:00
parent a5eaccb29a
commit 18c6087d56
3 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
feeds/wifi-ax/hostapd/files/wpa_supplicant.uc
View File

@@ -94,7 +94,9 @@ let main_obj = {
return libubus.STATUS_INVALID_ARGUMENT; return libubus.STATUS_INVALID_ARGUMENT;
} }
return 0; return {
pid: wpas.getpid()
};
} }
}, },
config_add: { config_add: {

2
feeds/wifi-ax/hostapd/src/src/utils/ucode.c
View File

@@ -208,7 +208,7 @@ uc_value_t *wpa_ucode_registry_remove(uc_value_t *reg, int idx)
uc_value_t *val = wpa_ucode_registry_get(reg, idx); uc_value_t *val = wpa_ucode_registry_get(reg, idx);
if (val) if (val)
ucv_array_delete(reg, idx - 1, 1); ucv_array_set(reg, idx - 1, NULL);
return val; return val;
} }

14
feeds/wifi-ax/mac80211/files/lib/netifd/wireless/mac80211.sh
View File

@@ -752,7 +752,7 @@ mac80211_setup_adhoc() {
[ -n "$mcast_rate" ] && wpa_supplicant_add_rate mcval "$mcast_rate" [ -n "$mcast_rate" ] && wpa_supplicant_add_rate mcval "$mcast_rate"
local prev local prev
json_set_namespace wdev prev json_set_namespace wdev_uc prev
json_add_object "$ifname" json_add_object "$ifname"
json_add_string mode adhoc json_add_string mode adhoc
@@ -778,7 +778,7 @@ mac80211_setup_mesh() {
[ -n "$mesh_id" ] && ssid="$mesh_id" [ -n "$mesh_id" ] && ssid="$mesh_id"
local prev local prev
json_set_namespace wdev prev json_set_namespace wdev_uc prev
json_add_object "$ifname" json_add_object "$ifname"
json_add_string mode mesh json_add_string mode mesh
@@ -797,7 +797,7 @@ mac80211_setup_mesh() {
mac80211_setup_monitor() { mac80211_setup_monitor() {
local prev local prev
json_set_namespace wdev prev json_set_namespace wdev_uc prev
json_add_object "$ifname" json_add_object "$ifname"
json_add_string mode monitor json_add_string mode monitor
@@ -1073,13 +1073,13 @@ drv_mac80211_setup() {
wpa_supp_init= wpa_supp_init=
for_each_interface "ap" mac80211_check_ap for_each_interface "ap" mac80211_check_ap
mv "$hostapd_conf_file" "$hostapd_conf_file.prev" [ -f "$hostapd_conf_file" ] && mv "$hostapd_conf_file" "$hostapd_conf_file.prev"
for_each_interface "sta adhoc mesh" mac80211_set_noscan for_each_interface "sta adhoc mesh" mac80211_set_noscan
[ -n "$has_ap" ] && mac80211_hostapd_setup_base "$phy" [ -n "$has_ap" ] && mac80211_hostapd_setup_base "$phy"
local prev local prev
json_set_namespace wdev prev json_set_namespace wdev_uc prev
json_init json_init
json_set_namespace "$prev" json_set_namespace "$prev"
@@ -1104,8 +1104,8 @@ drv_mac80211_setup() {
[ -n "$wpa_supp_init" ] && wpa_supplicant_start "$phy" [ -n "$wpa_supp_init" ] && wpa_supplicant_start "$phy"
json_set_namespace wdev prev json_set_namespace wdev_uc prev
wdev_tool "$(json_dump)" $active_ifnames wdev_tool "$phy" "$(json_dump)" $active_ifnames
json_set_namespace "$prev" json_set_namespace "$prev"
for_each_interface "ap sta adhoc mesh monitor" mac80211_set_vif_txpower for_each_interface "ap sta adhoc mesh monitor" mac80211_set_vif_txpower