wifi: rename the "reload" (restarting non-netifd wifi) command to "reload_legacy"

Add a new "reload" command that reloads the netifd config as well

Signed-off-by: Felix Fietkau <nbd@openwrt.org>
SVN-Revision: 38989

diff --git a/package/base-files/files/sbin/wifi b/package/base-files/files/sbin/wifi
index 7663432bd3b82825fe38a0285f1ba55b5e7958f6..2687f1e90ae5cb115547d26a2391dde6a9eb9ec6 100755 (executable)
--- a/package/base-files/files/sbin/wifi
+++ b/package/base-files/files/sbin/wifi
@@ -133,12 +133,17 @@ wifi_updown() {
        _wifi_updown "$@"
 }
 
-wifi_reload() {
+wifi_reload_legacy() {
        _wifi_updown "disable" "$1"
        scan_wifi
        _wifi_updown "enable" "$1"
 }
 
+wifi_reload() {
+       ubus call network reload
+       wifi_reload_legacy
+}
+
 wifi_detect() {
        for driver in ${2:-$DRIVERS}; do (
                if eval "type detect_$driver" 2>/dev/null >/dev/null; then
@@ -224,6 +229,7 @@ case "$1" in
        detect) wifi_detect "$2";;
        status) ubus_wifi_cmd "status" "$2";;
        reload) wifi_reload "$2";;
+       reload_legacy) wifi_reload_legacy "$2";;
        --help|help) usage;;
        *) wifi_updown "enable" "$2";;
 esac

diff --git a/package/network/config/netifd/files/etc/init.d/network b/package/network/config/netifd/files/etc/init.d/network
index 8b2d368d6ae22d9c6d60a158b808f4e5678596ed..387fdbe5dda6f75dd52f5841dcb65c495a4fa0be 100755 (executable)
--- a/package/network/config/netifd/files/etc/init.d/network
+++ b/package/network/config/netifd/files/etc/init.d/network
@@ -18,7 +18,7 @@ start_service() {
 
 reload_service() {
        ubus call network reload
-       /sbin/wifi reload
+       /sbin/wifi reload_legacy
 }
 
 stop_service() {