Really add the LED driver :)

[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 8083612..46f994e 100755 (executable)
--- a/package/madwifi/files/lib/wifi/madwifi.sh
+++ b/package/madwifi/files/lib/wifi/madwifi.sh
@@ -14,7 +14,7 @@ scan_atheros() {
                
                config_get mode "$vif" mode
                case "$mode" in
-                       adhoc|sta|ap)
+                       adhoc|ahdemo|sta|ap)
                                append $mode "$vif"
                        ;;
                        wds)
@@ -35,6 +35,7 @@ scan_atheros() {
        case "${adhoc:+1}:${sta:+1}:${ap+1}" in
                # valid mode combinations
                1::) wds="";;
+               1::1);;
                :1:1)config_set "$device" nosbeacon 1;; # AP+STA, can't use beacon timers for STA
                :1:);;
                ::1);;
@@ -42,7 +43,7 @@ scan_atheros() {
                *) echo "$device: Invalid mode combination in config"; return 1;;
        esac
 
-       config_set "$device" vifs "${ap:+$ap }${adhoc:+$adhoc }${sta:+$sta }${wds:+$wds }"
+       config_set "$device" vifs "${ap:+$ap }${adhoc:+$adhoc }${ahdemo:+$ahdemo }${sta:+$sta }${wds:+$wds }"
 }
 
 
@@ -99,17 +100,22 @@ enable_atheros() {
                                *bg) agmode=11g;;
                                *g) agmode=11g; pureg=1;;
                                *a) agmode=11a;;
-                               *) agmode=11g;;
+                               *) agmode=auto;;
                        esac
-                       iwconfig "$ifname" channel 0 
+                       iwconfig "$ifname" channel 0 >/dev/null 2>/dev/null 
+                       ifconfig "$ifname" up
+                       sleep 1
                        iwpriv "$ifname" mode "$agmode"
                        iwpriv "$ifname" pureg "$pureg"
-                       iwconfig "$ifname" channel "$channel"
+                       iwconfig "$ifname" channel "$channel" >/dev/null 2>/dev/null 
                }
        
-               config_get_bool hidden "$vif" hidden
+               config_get_bool hidden "$vif" hidden 0
                iwpriv "$ifname" hide_ssid "$hidden"
 
+               config_get_bool ff "$vif" ff 0
+               iwpriv "$ifname" ff "$ff"
+
                config_get wds "$vif" wds
                case "$wds" in
                        1|on|enabled) wds=1;;
@@ -125,7 +131,11 @@ enable_atheros() {
                                        iwconfig "$ifname" enc "[$idx]" "${key:-off}"
                                done
                                config_get key "$vif" key
-                               iwconfig "$ifname" enc "${key:-1}"
+                               key="${key:-1}"
+                               case "$key" in
+                                       [1234]) iwconfig "$ifname" enc "[$key]";;
+                                       *) iwconfig "$ifname" enc "$key";;
+                               esac
                        ;;
                        PSK|psk|PSK2|psk2)
                                config_get key "$vif" key
@@ -137,10 +147,14 @@ enable_atheros() {
                                config_get addr "$vif" bssid
                                iwpriv "$ifname" wds_add "$addr"
                        ;;
-                       *)
-                               config_get ssid "$vif" ssid
+                       adhoc|ahdemo)
+                               config_get addr "$vif" bssid
+                               [ -z "$addr" ] || { 
+                                       iwconfig "$ifname" ap "$addr"
+                               }
                        ;;
                esac
+               config_get ssid "$vif" ssid
 
                [ "$mode" = "sta" ] && {
                        config_get_bool bgscan "$vif" bgscan 1
@@ -170,7 +184,18 @@ enable_atheros() {
                        iwconfig "$ifname" txpower "${txpwr%%.*}"
                fi
 
+               config_get frag "$vif" frag
+               if [ -n "$frag" ]; then
+                       iwconfig "$ifname" frag "${frag%%.*}"
+               fi
+
+               config_get rts "$vif" rts
+               if [ -n "$rts" ]; then
+                       iwconfig "$ifname" rts "${rts%%.*}"
+               fi
+
                ifconfig "$ifname" up
+               iwconfig "$ifname" channel "$channel" >/dev/null 2>/dev/null 
 
                local net_cfg bridge
                net_cfg="$(find_net_config "$vif")"
@@ -182,13 +207,18 @@ enable_atheros() {
                iwconfig "$ifname" essid "$ssid"
                case "$mode" in
                        ap)
-                               hostapd_setup_vif "$vif" madwifi || {
-                                       echo "enable_atheros($device): Failed to set up wpa for interface $ifname" >&2
-                                       # make sure this wifi interface won't accidentally stay open without encryption
-                                       ifconfig "$ifname" down
-                                       wlanconfig "$ifname" destroy
-                                       continue
-                               }
+                               config_get_bool isolate "$vif" isolate 0
+                               iwpriv "$ifname" ap_bridge "$((isolate^1))"
+
+                               if eval "type hostapd_setup_vif" 2>/dev/null >/dev/null; then
+                                       hostapd_setup_vif "$vif" madwifi || {
+                                               echo "enable_atheros($device): Failed to set up wpa for interface $ifname" >&2
+                                               # make sure this wifi interface won't accidentally stay open without encryption
+                                               ifconfig "$ifname" down
+                                               wlanconfig "$ifname" destroy
+                                               continue
+                                       }
+                               fi
                        ;;
                        wds|sta)
                                case "$enc" in 
@@ -214,11 +244,7 @@ EOF
                                                #add wpa_supplicant calls here
                                        ;;
                                esac
-                               net_cfg="$(find_net_config "$vif")"
-                               [ -z "$net_cfg" ] || {
-                                       bridge="$(bridge_interface "$net_cfg")"
-                               }
-                               wpa_supplicant ${bridge:+ -b $bridge} -Bw -D wext -i "$ifname" -c /var/run/wpa_supplicant-$ifname.conf
+                               [ -z "$proto" ] || wpa_supplicant ${bridge:+ -b $bridge} -Bw -D wext -i "$ifname" -c /var/run/wpa_supplicant-$ifname.conf
                        ;;
                esac
                first=0
@@ -229,31 +255,23 @@ EOF
 detect_atheros() {
        cd /proc/sys/dev
        [ -d ath ] || return
-       for dev in wifi*; do
+       for dev in $(ls -d wifi* 2>&-); do
                config_get type "$dev" type
                [ "$type" = atheros ] && return
                cat <<EOF
 config wifi-device  $dev
        option type     atheros
        option channel  5
-#       option diversity 1
-#       option txantenna 0
-#       option rxantenna 0
-#       option distance  2000
-# disable radio to prevent an open ap after reflashing:
-       option radio    0
 
+       # REMOVE THIS LINE TO ENABLE WIFI:
+       option disabled 1
 
 config wifi-iface
        option device   $dev
        option network  lan
        option mode     ap
        option ssid     OpenWrt
-       option hidden   0
-#      option txpower  15
-#      option bgscan   enable
        option encryption none
-
 EOF
        done
 }