mac80211: Declare some variables as local and remove unused

[openwrt/openwrt.git] / package / mac80211 / files / lib / wifi / mac80211.sh

diff --git a/package/mac80211/files/lib/wifi/mac80211.sh b/package/mac80211/files/lib/wifi/mac80211.sh
index 77c79763512c0422110ce20160d85b71af7cba20..5d4fcee2713206697a4484652cb9fe0979b304d1 100644 (file)
--- a/package/mac80211/files/lib/wifi/mac80211.sh
+++ b/package/mac80211/files/lib/wifi/mac80211.sh
@@ -3,7 +3,7 @@ append DRIVERS "mac80211"
 
 scan_mac80211() {
        local device="$1"
-       local adhoc sta ap
+       local adhoc sta ap monitor mesh
 
        config_get vifs "$device" vifs
        for vif in $vifs; do
@@ -20,7 +20,7 @@ scan_mac80211() {
                esac
        done
 
-       config_set "$device" vifs "${ap:+$ap }${adhoc:+$adhoc }${ahdemo:+$ahdemo }${sta:+$sta }${wds:+$wds }${monitor:+$monitor }${mesh:+$mesh}"
+       config_set "$device" vifs "${ap:+$ap }${adhoc:+$adhoc }${sta:+$sta }${monitor:+$monitor }${mesh:+$mesh}"
 }
 
 
@@ -54,6 +54,7 @@ enable_mac80211() {
 
        local first=1
        local mesh_idx=0
+       wifi_fixup_hwmode "$device" "g"
        for vif in $vifs; do
                ifconfig "$ifname" down 2>/dev/null
                config_get ifname "$vif" ifname
@@ -174,6 +175,7 @@ enable_mac80211() {
                                # special case where physical interface should be down for mesh to work
                                ifconfig "$ifname" down
                                ifconfig "msh$mesh_idx" up
+                               iwlist msh$mesh_idx scan 2>/dev/null >/dev/null
                        ;;
                esac
                first=0