From: John Crispin <john@phrozen.org>
Date: Fri, 27 Mar 2020 11:40:23 +0000 (+0100)
Subject: hostapd: fix no_reload logic
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=22d896eb218765f362587df6008f67018435d6a5;p=oweals%2Fopenwrt.git

hostapd: fix no_reload logic

the code would unconditionally tear down all interfaces upon a reconf.
This should only be done when the reconf call fails.

Signed-off-by: John Crispin <john@phrozen.org>
---

diff --git a/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh b/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh
index f59c498215..7348db0354 100644
--- a/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh
+++ b/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh
@@ -954,8 +954,10 @@ drv_mac80211_setup() {
 			[ "${NEW_MD5}" = "${OLD_MD5}" ] || {
 				ubus call hostapd.$primary_ap reload
 				no_reload=$?
-				mac80211_vap_cleanup hostapd "${OLDAPLIST}"
-		                [ -n "${NEWAPLIST}" ] && mac80211_iw_interface_add "$phy" "${NEWAPLIST%% *}" __ap || return
+				if [ "$no_reload" != "0" ]; then
+					mac80211_vap_cleanup hostapd "${OLDAPLIST}"
+			                [ -n "${NEWAPLIST}" ] && mac80211_iw_interface_add "$phy" "${NEWAPLIST%% *}" __ap || return
+				fi
 			}
 		fi
 		if [ "$no_reload" != "0" ]; then