upgrade the ixp4xx ethernet driver to v0.3.1, split the Gateway 7001 support to two...

[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 a22b5c4..10e8ab1 100755 (executable)
--- a/package/madwifi/files/lib/wifi/madwifi.sh
+++ b/package/madwifi/files/lib/wifi/madwifi.sh
@@ -38,7 +38,7 @@ scan_atheros() {
                :1:1)config_set "$device" nosbeacon 1;; # AP+STA, can't use beacon timers for STA
                :1:);;
                ::1);;
                :1:1)config_set "$device" nosbeacon 1;; # AP+STA, can't use beacon timers for STA
                :1:);;
                ::1);;

-               :::);;
+               ::);;

                *) echo "$device: Invalid mode combination in config"; return 1;;
        esac
 
                *) echo "$device: Invalid mode combination in config"; return 1;;
        esac
 


@@ -73,6 +73,7 @@ enable_atheros() {
        config_get vifs "$device" vifs
        
        disable_atheros "$device"
        config_get vifs "$device" vifs
        
        disable_atheros "$device"

+       local first=1

        for vif in $vifs; do
                nosbeacon=
                config_get ifname "$vif" ifname
        for vif in $vifs; do
                nosbeacon=
                config_get ifname "$vif" ifname


@@ -89,8 +90,25 @@ enable_atheros() {
                }
                config_set "$vif" ifname "$ifname"
 
                }
                config_set "$vif" ifname "$ifname"
 

-               config_get "$device" mode
-               iwpriv "$ifname" mode "${mode:-11g}"
+               [ "$first" = 1 ] && {
+                       # only need to change freq band and channel on the first vif
+                       config_get agmode "$device" mode
+                       pureg=0
+                       case "$agmode" in
+                               *b) agmode=11b;;
+                               *bg) agmode=11g;;
+                               *g) agmode=11g; pureg=1;;
+                               *a) agmode=11a;;
+                               *) agmode=11g;;
+                       esac
+                       iwconfig "$ifname" channel 0 
+                       iwpriv "$ifname" mode "$agmode"
+                       iwpriv "$ifname" pureg "$pureg"
+                       iwconfig "$ifname" channel "$channel"
+               }
+       
+               config_get_bool hidden "$vif" hidden
+               iwpriv "$ifname" hide_ssid "$hidden"

 
                config_get wds "$vif" wds
                case "$wds" in
 
                config_get wds "$vif" wds
                case "$wds" in


@@ -107,7 +125,7 @@ enable_atheros() {
                                        iwconfig "$ifname" enc "[$idx]" "${key:-off}"
                                done
                                config_get key "$vif" key
                                        iwconfig "$ifname" enc "[$idx]" "${key:-off}"
                                done
                                config_get key "$vif" key

-                               iwconfig "$ifname" enc "[${key:-1}]"
+                               iwconfig "$ifname" enc "${key:-1}"

                        ;;
                esac
 
                        ;;
                esac
 


@@ -120,7 +138,6 @@ enable_atheros() {
                                config_get ssid "$vif" ssid
                        ;;
                esac
                                config_get ssid "$vif" ssid
                        ;;
                esac

-               iwconfig "$ifname" channel "$channel"

                ifconfig "$ifname" up
                
                local net_cfg bridge
                ifconfig "$ifname" up
                
                local net_cfg bridge


@@ -145,6 +162,7 @@ enable_atheros() {
                                # FIXME: implement wpa_supplicant calls here
                        ;;
                esac
                                # FIXME: implement wpa_supplicant calls here
                        ;;
                esac

+               first=0

        done
 }
 
        done
 }