[backfire] merge r28199

git-svn-id: svn://svn.openwrt.org/openwrt/branches/backfire@28284 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/package/madwifi/files/lib/wifi/madwifi.sh b/package/madwifi/files/lib/wifi/madwifi.sh
index 51b60bc..564741b 100755 (executable)
--- a/package/madwifi/files/lib/wifi/madwifi.sh
+++ b/package/madwifi/files/lib/wifi/madwifi.sh
@@ -4,11 +4,13 @@ append DRIVERS "atheros"
 scan_atheros() {
        local device="$1"
        local wds
-       local adhoc ahdemo sta ap monitor
+       local adhoc ahdemo sta ap monitor disabled
        
        config_get vifs "$device" vifs
        for vif in $vifs; do
-       
+               config_get_bool disabled "$vif" disabled 0
+               [ $disabled = 0 ] || continue
+
                config_get ifname "$vif" ifname
                config_set "$vif" ifname "${ifname:-ath}"