From: Bob Cantor <bobc@confidesk.com>
Date: Sun, 4 Jul 2021 17:26:46 +0000 (+1000)
Subject: base-files: wifi: for wifi reconf, scan_wifi after network reload
X-Git-Tag: v23.05.0-rc1~1960
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=80a62a675d2ef57a1885e1829926dd2ea1682612;p=openwrt%2Fopenwrt.git

base-files: wifi: for wifi reconf, scan_wifi after network reload

Commit e8b542960921 included an unintended change and we now call
scan_wifi before a network reload.

Restore the original behaviour and call scan_wifi only after a network
reload.

Fixes: e8b542960921 ("base-files: wifi: tidy up the reconf code")
Signed-off-by: Bob Cantor <bobc@confidesk.com>
---

diff --git a/package/base-files/files/sbin/wifi b/package/base-files/files/sbin/wifi
index 7e248add9d..6a9dce7e8a 100755
--- a/package/base-files/files/sbin/wifi
+++ b/package/base-files/files/sbin/wifi
@@ -133,9 +133,9 @@ wifi_updown() {
 		cmd=up
 	}
 	[ reconf = "$1" ] && {
+		ubus call network reload
 		scan_wifi
 		cmd=reconf
-		ubus call network reload
 	}
 	ubus_wifi_cmd "$cmd" "$2"
 	_wifi_updown "$@"