enable TCP ECN by default (see #3001 for more information)

[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 010391e..bec7238 100755 (executable)
--- a/package/madwifi/files/lib/wifi/madwifi.sh
+++ b/package/madwifi/files/lib/wifi/madwifi.sh
@@ -81,6 +81,7 @@ enable_atheros() {
                nosbeacon=
                config_get ifname "$vif" ifname
                config_get enc "$vif" encryption
+               config_get eap_type "$vif" eap_type
                config_get mode "$vif" mode
                
                [ "$mode" = sta ] && config_get nosbeacon "$device" nosbeacon
@@ -103,7 +104,11 @@ enable_atheros() {
                                *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"
@@ -119,9 +124,6 @@ enable_atheros() {
                        iwpriv "$ifname" ff "$ff"
                fi
 
-               config_get wdssep "$vif" wdssep
-               [ -n "$wdssep" ] && iwpriv "$ifname" wdssep "$wdssep"
-
                config_get wds "$vif" wds
                case "$wds" in
                        1|on|enabled) wds=1;;
@@ -129,6 +131,11 @@ enable_atheros() {
                esac
                iwpriv "$ifname" wds "$wds"
 
+               [ "$mode" = ap -a "$wds" = 1 ] && {
+                       config_get_bool wdssep "$vif" wdssep 1
+                       [ -n "$wdssep" ] && iwpriv "$ifname" wdssep "$wdssep"
+               }
+
                wpa=
                case "$enc" in
                        WEP|wep)
@@ -255,7 +262,7 @@ enable_atheros() {
 
                                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
+                                               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
                                                ifconfig "$ifname" down
                                                wlanconfig "$ifname" destroy
@@ -264,42 +271,14 @@ enable_atheros() {
                                fi
                        ;;
                        wds|sta)
-                               config_get_bool usepassphrase "$vif" passphrase 1
-                               case "$enc" in
-                                       PSK|psk|PSK2|psk2)
-                                               case "$enc" in
-                                                       PSK|psk)
-                                                               proto='proto=WPA'
-                                                               if [ "$usepassphrase" = "1" ]; then
-                                                                       passphrase="psk=\"${key}\""
-                                                               else
-                                                                       passphrase="psk=${key}"
-                                                               fi
-                                                               ;;
-                                                       PSK2|psk2)
-                                                               proto='proto=RSN'
-                                                                if [ "$usepassphrase" = "1" ]; then
-                                                                        passphrase="psk=\"${key}\""
-                                                                else
-                                                                        passphrase="psk=${key}"
-                                                                fi
-                                                               ;;
-                                               esac
-                                               cat > /var/run/wpa_supplicant-$ifname.conf <<EOF
-network={
-       scan_ssid=1
-       ssid="$ssid"
-       key_mgmt=WPA-PSK
-       $proto
-       $passphrase
-}
-EOF
-                                       ;;
-                                       WPA|wpa|WPA2|wpa2)
-                                               #add wpa_supplicant calls here
-                                       ;;
-                               esac
-                               [ -z "$proto" ] || wpa_supplicant ${bridge:+ -b $bridge} -B -D madwifi -i "$ifname" -c /var/run/wpa_supplicant-$ifname.conf
+                               if eval "type wpa_supplicant_setup_vif" 2>/dev/null >/dev/null; then
+                                       wpa_supplicant_setup_vif "$vif" madwifi || {
+                                               echo "enable_atheros($device): Failed to set up wpa_supplicant for interface $ifname" >&2
+                                               ifconfig "$ifname" down
+                                               wlanconfig "$ifname" destroy
+                                               continue
+                                       }
+                               fi
                        ;;
                esac
                first=0