[openwrt/openwrt] base-files: wifi: for wifi reconf, scan_wifi after network reload

[LEDE Commits]

ansuel pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/80a62a675d2ef57a1885e1829926dd2ea1682612

commit 80a62a675d2ef57a1885e1829926dd2ea1682612
Author: Bob Cantor <bobc at confidesk.com>
AuthorDate: Mon Jul 5 03:26:46 2021 +1000

    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 at confidesk.com>
---
 package/base-files/files/sbin/wifi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 "$@"