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 dd030ba..10e8ab1 100755 (executable)
--- a/package/madwifi/files/lib/wifi/madwifi.sh
+++ b/package/madwifi/files/lib/wifi/madwifi.sh
@@ -38,78 +38,13 @@ scan_atheros() {
                :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
 
        config_set "$device" vifs "${ap:+$ap }${adhoc:+$adhoc }${sta:+$sta }${wds:+$wds }"
 }
 
-hostapd_setup_vif() {
-       local vif="$1"
-       local driver="$2"
-       local hostapd_cfg=
-
-       # Examples:
-       # psk-mixed/tkip        => WPA1+2 PSK, TKIP
-       # wpa-psk2/tkip+aes     => WPA2 PSK, CCMP+TKIP
-       # wpa2/tkip+aes         => WPA2 RADIUS, CCMP+TKIP
-       # ...
-
-       # TODO: move this parsing function somewhere generic, so that
-       # later it can be reused by drivers that don't use hostapd
-       
-       # crypto defaults: WPA2 vs WPA1
-       case "$enc" in
-               wpa2*|WPA2*|*PSK2*|*psk2*)
-                       wpa=2
-                       crypto="CCMP"
-               ;;
-               *mixed*)
-                       wpa=3
-                       crypto="CCMP TKIP"
-               ;;
-               *) 
-                       wpa=1
-                       crypto="TKIP"
-               ;;
-       esac
-
-       # explicit override for crypto setting
-       case "$enc" in
-               *tkip+aes|*TKIP+AES|*tkip+ccmp|*TKIP+CCMP) crypto="CCMP TKIP";;
-               *tkip|*TKIP) crypto="TKIP";;
-               *aes|*AES|*ccmp|*CCMP) crypto="CCMP";;
-       esac
-       
-       # use crypto/auth settings for building the hostapd config
-       case "$enc" in
-               *psk*|*PSK*)
-                       config_get psk "$vif" key
-                       append hostapd_cfg "wpa_passphrase=$psk" "$N"
-               ;;
-               *wpa*|*WPA*)
-               # FIXME: add wpa+radius here
-               ;;
-               *)
-                       return 0;
-               ;;
-       esac
-       config_get ifname "$vif" ifname
-       config_get bridge "$vif" bridge
-       config_get ssid "$vif" ssid
-       cat > /var/run/hostapd-$ifname.conf <<EOF
-driver=$driver
-interface=$ifname
-${bridge:+bridge=$bridge}
-ssid=$ssid
-debug=0
-wpa=$wpa
-wpa_pairwise=$crypto
-$hostapd_cfg
-EOF
-       hostapd -B /var/run/hostapd-$ifname.conf
-}
 
 disable_atheros() (
        local device="$1"
@@ -138,6 +73,7 @@ enable_atheros() {
        config_get vifs "$device" vifs
        
        disable_atheros "$device"
+       local first=1
        for vif in $vifs; do
                nosbeacon=
                config_get ifname "$vif" ifname
@@ -154,8 +90,25 @@ enable_atheros() {
                }
                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
@@ -172,7 +125,7 @@ enable_atheros() {
                                        iwconfig "$ifname" enc "[$idx]" "${key:-off}"
                                done
                                config_get key "$vif" key
-                               iwconfig "$ifname" enc "[${key:-1}]"
+                               iwconfig "$ifname" enc "${key:-1}"
                        ;;
                esac
 
@@ -185,7 +138,6 @@ enable_atheros() {
                                config_get ssid "$vif" ssid
                        ;;
                esac
-               iwconfig "$ifname" channel "$channel"
                ifconfig "$ifname" up
                
                local net_cfg bridge
@@ -195,6 +147,7 @@ enable_atheros() {
                        config_set "$vif" bridge "$bridge"
                        start_net "$ifname" "$net_cfg"
                }
+               iwconfig "$ifname" essid "$ssid"
                case "$mode" in
                        ap)
                                hostapd_setup_vif "$vif" madwifi || {
@@ -206,10 +159,10 @@ enable_atheros() {
                                }
                        ;;
                        wds|sta)
-                               iwconfig "$ifname" essid "$ssid"
                                # FIXME: implement wpa_supplicant calls here
                        ;;
                esac
+               first=0
        done
 }