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 5ccc52b..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
 


@@ -92,20 +92,23 @@ enable_atheros() {
 
                [ "$first" = 1 ] && {
                        # only need to change freq band and channel on the first vif
 
                [ "$first" = 1 ] && {
                        # only need to change freq band and channel on the first vif

-                       config_get "$device" mode
+                       config_get agmode "$device" mode

                        pureg=0
                        pureg=0

-                       case "$mode" in
-                               *b) mode=11b;;
-                               *bg) mode=11g;;
-                               *g) mode=11g; pureg=1;;
-                               *a) mode=11a;;
-                               *) mode=11g;;
+                       case "$agmode" in
+                               *b) agmode=11b;;
+                               *bg) agmode=11g;;
+                               *g) agmode=11g; pureg=1;;
+                               *a) agmode=11a;;
+                               *) agmode=11g;;

                        esac
                        iwconfig "$ifname" channel 0 
                        esac
                        iwconfig "$ifname" channel 0 

-                       iwpriv "$ifname" mode "$mode"
+                       iwpriv "$ifname" mode "$agmode"

                        iwpriv "$ifname" pureg "$pureg"
                        iwconfig "$ifname" channel "$channel"
                }
                        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


@@ -122,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