From: Bob Cantor <coxede6557@w3boats.com>
Date: Thu, 24 Jun 2021 18:48:45 +0000 (+1000)
Subject: base-files: wifi: tidy up the reconf code
X-Git-Tag: v21.02.0-rc4~42
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=a9100f21967313141020bfee517e0b307d25ab5b;p=openwrt%2Fstaging%2Fhauke.git

base-files: wifi: tidy up the reconf code

commit 5edbd390d321532d9a697d6895a1a7c71c40bd5d rearranged the
"wifi up" code.

This commit tidies up the "wifi reconf" code so as to
keep it aligned with the "wifi up" code.

branches affected: trunk, 21.02

Signed-off-by: Bob Cantor <coxede6557@w3boats.com>
(cherry-picked from commit e8b54296092118fbef75de796d57799cc6c7b927)
---

diff --git a/package/base-files/files/sbin/wifi b/package/base-files/files/sbin/wifi
index b2dde6f01c..6b9662fe93 100755
--- a/package/base-files/files/sbin/wifi
+++ b/package/base-files/files/sbin/wifi
@@ -135,6 +135,7 @@ wifi_updown() {
 	[ reconf = "$1" ] && {
 		scan_wifi
 		cmd=reconf
+		ubus call network reload
 	}
 	ubus_wifi_cmd "$cmd" "$2"
 	_wifi_updown "$@"
@@ -247,7 +248,7 @@ case "$1" in
 	reload) wifi_reload "$2";;
 	reload_legacy) wifi_reload_legacy "$2";;
 	--help|help) usage;;
-	reconf) ubus call network reload; wifi_updown "reconf" "$2";;
+	reconf) wifi_updown "reconf" "$2";;
 	''|up) wifi_updown "enable" "$2";;
 	*) usage; exit 1;;
 esac