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

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

Commit b82cc8071366 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: b82cc8071366 ("base-files: wifi: swap the order of some ubus calls")
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 6b9662fe93..7e248add9d 100755
--- a/package/base-files/files/sbin/wifi
+++ b/package/base-files/files/sbin/wifi
@@ -128,9 +128,9 @@ wifi_updown() {
 	[ enable = "$1" ] && {
 		_wifi_updown disable "$2"
 		ubus_wifi_cmd "$cmd" "$2"
+		ubus call network reload
 		scan_wifi
 		cmd=up
-		ubus call network reload
 	}
 	[ reconf = "$1" ] && {
 		scan_wifi