[package] mac80211: change wireless ifname numbering schema

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

diff --git a/package/madwifi/files/lib/wifi/madwifi.sh b/package/madwifi/files/lib/wifi/madwifi.sh
index 21a5cf7..93e68f5 100755 (executable)
--- a/package/madwifi/files/lib/wifi/madwifi.sh
+++ b/package/madwifi/files/lib/wifi/madwifi.sh
@@ -28,13 +28,15 @@ find_atheros_phy() {
 scan_atheros() {
        local device="$1"
        local wds
 scan_atheros() {
        local device="$1"
        local wds

-       local adhoc ahdemo sta ap monitor
+       local adhoc ahdemo sta ap monitor disabled

 
        [ ${device%[0-9]} = "wifi" ] && config_set "$device" phy "$device"
        
        config_get vifs "$device" vifs
        for vif in $vifs; do
 
        [ ${device%[0-9]} = "wifi" ] && config_set "$device" phy "$device"
        
        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}"
                
                config_get ifname "$vif" ifname
                config_set "$vif" ifname "${ifname:-ath}"
                


@@ -303,10 +305,10 @@ enable_atheros() {
                config_get_bool comp "$vif" compression 0
                iwpriv "$ifname" compression "$comp" >/dev/null 2>&1
 
                config_get_bool comp "$vif" compression 0
                iwpriv "$ifname" compression "$comp" >/dev/null 2>&1
 

-               config_get_bool minrate "$vif" minrate
+               config_get minrate "$vif" minrate

                [ -n "$minrate" ] && iwpriv "$ifname" minrate "$minrate"
 
                [ -n "$minrate" ] && iwpriv "$ifname" minrate "$minrate"
 

-               config_get_bool maxrate "$vif" maxrate
+               config_get maxrate "$vif" maxrate

                [ -n "$maxrate" ] && iwpriv "$ifname" maxrate "$maxrate"
 
                config_get_bool burst "$vif" bursting
                [ -n "$maxrate" ] && iwpriv "$ifname" maxrate "$maxrate"
 
                config_get_bool burst "$vif" bursting


@@ -366,7 +368,7 @@ enable_atheros() {
                config_get ssid "$vif" ssid
                [ -n "$ssid" ] && {
                        iwconfig "$ifname" essid on
                config_get ssid "$vif" ssid
                [ -n "$ssid" ] && {
                        iwconfig "$ifname" essid on

-                       iwconfig "$ifname" essid "$ssid"
+                       iwconfig "$ifname" essid ${ssid:+-- }"$ssid"

                }
 
                set_wifi_up "$vif" "$ifname"
                }
 
                set_wifi_up "$vif" "$ifname"