[openwrt/openwrt] hostapd: do not restart hostapd instance on wireless restarts

LEDE Commits lede-commits at lists.infradead.org
Thu Dec 31 08:26:14 EST 2020


nbd pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/e1851720f10a7706a3654b64585b622de6adcf3d

commit e1851720f10a7706a3654b64585b622de6adcf3d
Author: Felix Fietkau <nbd at nbd.name>
AuthorDate: Mon Dec 28 15:01:00 2020 +0100

    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 at nbd.name>
---
 package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh | 2 +-
 package/network/services/hostapd/files/hostapd.sh             | 2 +-
 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
 }



More information about the lede-commits mailing list