[ar71xx] experimental support for 2.6.27

[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 bec7238..df34531 100755 (executable)
--- a/package/madwifi/files/lib/wifi/madwifi.sh
+++ b/package/madwifi/files/lib/wifi/madwifi.sh
@@ -78,6 +78,7 @@ enable_atheros() {
 
        local first=1
        for vif in $vifs; do
+               local start_hostapd
                nosbeacon=
                config_get ifname "$vif" ifname
                config_get enc "$vif" encryption
@@ -94,25 +95,26 @@ enable_atheros() {
                }
                config_set "$vif" ifname "$ifname"
 
+               # only need to change freq band and channel on the first vif
+               config_get agmode "$device" agmode
+               [ -z "$agmode" ] && config_get agmode "$device" mode
+
+               pureg=0
+               case "$agmode" in
+                       *b) agmode=11b;;
+                       *bg) agmode=11g;;
+                       *g) agmode=11g; pureg=1;;
+                       *gdt) agmode=11gdt;;
+                       *a) agmode=11a;;
+                       *adt) agmode=11adt;;
+                       *ast) agmode=11ast;;
+                       *fh) agmode=fh;;
+                       *) agmode=auto;;
+               esac
+               iwpriv "$ifname" mode "$agmode"
+               iwpriv "$ifname" pureg "$pureg"
+
                [ "$first" = 1 ] && {
-                       # only need to change freq band and channel on the first vif
-                       config_get agmode "$device" agmode
-                       [ -z "$agmode" ] && config_get agmode "$device" mode
-
-                       pureg=0
-                       case "$agmode" in
-                               *b) agmode=11b;;
-                               *bg) agmode=11g;;
-                               *g) agmode=11g; pureg=1;;
-                               *gdt) agmode=11gdt;;
-                               *a) agmode=11a;;
-                               *adt) agmode=11adt;;
-                               *ast) agmode=11ast;;
-                               *fh) agmode=fh;;
-                               *) agmode=auto;;
-                       esac
-                       iwpriv "$ifname" mode "$agmode"
-                       iwpriv "$ifname" pureg "$pureg"
                        iwconfig "$ifname" channel "$channel" >/dev/null 2>/dev/null 
                }
        
@@ -136,7 +138,6 @@ enable_atheros() {
                        [ -n "$wdssep" ] && iwpriv "$ifname" wdssep "$wdssep"
                }
 
-               wpa=
                case "$enc" in
                        WEP|wep)
                                for idx in 1 2 3 4; do
@@ -150,7 +151,8 @@ enable_atheros() {
                                        *) iwconfig "$ifname" enc "$key";;
                                esac
                        ;;
-                       PSK|psk|PSK2|psk2)
+                       psk*|wpa*)
+                               start_hostapd=1
                                config_get key "$vif" key
                        ;;
                esac
@@ -180,6 +182,9 @@ enable_atheros() {
                config_get distance "$device" distance
                [ -n "$distance" ] && athctrl -i "$device" -d "$distance" >&-
 
+               config_get_bool softled "$device" softled 1
+               [ -n "$softled" ] && sysctl -w dev."$device".softled="$softled" >&-
+
                config_get txpwr "$vif" txpower
                [ -n "$txpwr" ] && iwconfig "$ifname" txpower "${txpwr%%.*}"
 
@@ -253,6 +258,7 @@ enable_atheros() {
                        config_set "$vif" bridge "$bridge"
                        start_net "$ifname" "$net_cfg"
                }
+               [ -n "$ssid" ] && iwconfig "$ifname" essid on
                iwconfig "$ifname" essid "$ssid"
                set_wifi_up "$vif" "$ifname"
                case "$mode" in
@@ -260,7 +266,7 @@ enable_atheros() {
                                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
+                               if [ -n "$start_hostapd" ] && eval "type hostapd_setup_vif" 2>/dev/null >/dev/null; then
                                        hostapd_setup_vif "$vif" madwifi || {
                                                echo "enable_atheros($device): Failed to set up hostapd for interface $ifname" >&2
                                                # make sure this wifi interface won't accidentally stay open without encryption