aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@nbd.name>2020-12-28 15:01:00 +0100
committerFelix Fietkau <nbd@nbd.name>2020-12-31 14:26:00 +0100
commite1851720f10a7706a3654b64585b622de6adcf3d (patch)
treea4742edd0f1a0cf4431d5c60411bc5b835086298
parenta7ff013eb6669d787d0fded9ef2faa4cdd8d3bf1 (diff)
downloadupstream-e1851720f10a7706a3654b64585b622de6adcf3d.tar.gz
upstream-e1851720f10a7706a3654b64585b622de6adcf3d.tar.bz2
upstream-e1851720f10a7706a3654b64585b622de6adcf3d.zip
hostapd: do not restart hostapd instance on wireless restarts
Add the flag that prevents netifd from killing hostapd/wpa_supplicant Signed-off-by: Felix Fietkau <nbd@nbd.name>
-rw-r--r--package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh2
-rw-r--r--package/network/services/hostapd/files/hostapd.sh2
2 files changed, 2 insertions, 2 deletions
diff --git a/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh b/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh
index e12a804271..95b6c817ff 100644
--- a/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh
+++ b/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh
@@ -1021,7 +1021,7 @@ drv_mac80211_setup() {
ubus wait_for hostapd
ubus call hostapd config_add "{\"iface\":\"$primary_ap\", \"config\":\"${hostapd_conf_file}\"}"
local hostapd_pid=$(ubus call service list '{"name": "wpad"}' | jsonfilter -l 1 -e "@['wpad'].instances['hostapd'].pid")
- wireless_add_process "$hostapd_pid" "/usr/sbin/hostapd" 1
+ wireless_add_process "$hostapd_pid" "/usr/sbin/hostapd" 1 1
fi
ret="$?"
[ "$ret" != 0 ] && {
diff --git a/package/network/services/hostapd/files/hostapd.sh b/package/network/services/hostapd/files/hostapd.sh
index 78f6a19612..fc78e2fb90 100644
--- a/package/network/services/hostapd/files/hostapd.sh
+++ b/package/network/services/hostapd/files/hostapd.sh
@@ -1379,7 +1379,7 @@ wpa_supplicant_run() {
[ "$ret" != 0 ] && wireless_setup_vif_failed WPA_SUPPLICANT_FAILED
local supplicant_pid=$(ubus call service list '{"name": "wpad"}' | jsonfilter -l 1 -e "@['wpad'].instances['supplicant'].pid")
- wireless_add_process "$supplicant_pid" "/usr/sbin/wpa_supplicant" 1
+ wireless_add_process "$supplicant_pid" "/usr/sbin/wpa_supplicant" 1 1
return $ret
}