[package] sync macs with vif bssids in broadcom.sh, fixes multi-ssid with wpa

[openwrt.git] / package / base-files / files / sbin / wifi

diff --git a/package/base-files/files/sbin/wifi b/package/base-files/files/sbin/wifi
index 6e8e418..30ecb1b 100755 (executable)
--- a/package/base-files/files/sbin/wifi
+++ b/package/base-files/files/sbin/wifi
@@ -36,12 +36,13 @@ bridge_interface() {(
 
 
 wifi_updown() {
+       [ enable = "$1" ] && wifi_updown disable "$2"
        for device in ${2:-$DEVICES}; do (
-               config_get disabled "$device" disabled
-               [ "$disabled" == "1" ] && {
-                       echo "'$device' is disabled"
-                       set disable
-               }
+               config_get disabled "$device" disabled
+               [ 1 == "$disabled" ] && {
+                       echo "'$device' is disabled"
+                       set disable
+               }
                config_get iftype "$device" type
                if eval "type ${1}_$iftype" 2>/dev/null >/dev/null; then
                        eval "scan_$iftype '$device'"
@@ -66,11 +67,32 @@ start_net() {(
        local iface="$1"
        local config="$2"
 
+       [ -f "/var/run/$iface.pid" ] && kill "$(cat /var/run/${iface}.pid)" 2>/dev/null
        include /lib/network
        scan_interfaces
-       setup_interface "$1" "$2"
+       setup_interface "$1" "$2" "$3"
 )}
 
+set_wifi_up() {
+       local cfg="$1"
+       local ifname="$2"
+       uci_set_state wireless "$cfg" up 1
+       uci_set_state wireless "$cfg" ifname "$ifname"
+}
+
+set_wifi_down() {
+       local cfg="$1"
+       local vifs vif vifstr
+
+       [ -f "/var/run/wifi-${cfg}.pid" ] &&
+               kill "$(cat "/var/run/wifi-${cfg}.pid")"
+       uci_revert_state wireless "$cfg"
+       config_get vifs "$cfg" vifs
+       for vif in $vifs; do
+               uci_revert_state wireless "$vif"
+       done
+}
+
 scan_wifi() {
        local cfgfile="$1"
        config_cb() {