disable radar detection by default until it is fixed

[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 41a25a4..400cb77 100755 (executable)
--- a/package/madwifi/files/lib/wifi/madwifi.sh
+++ b/package/madwifi/files/lib/wifi/madwifi.sh
@@ -74,7 +74,9 @@ enable_atheros() {
        local device="$1"
        config_get channel "$device" channel
        config_get vifs "$device" vifs
-       
+
+       [ auto = "$channel" ] && channel=0
+
        local first=1
        for vif in $vifs; do
                nosbeacon=
@@ -114,8 +116,10 @@ enable_atheros() {
                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 ff "$vif" ff
+               if [ -n "$ff" ]; then
+                       iwpriv "$ifname" ff "$ff"
+               fi
 
                config_get wds "$vif" wds
                case "$wds" in
@@ -157,41 +161,82 @@ enable_atheros() {
                esac
                config_get ssid "$vif" ssid
 
-               config_get_bool bgscan "$vif" bgscan 0
-               iwpriv "$ifname" bgscan "$bgscan"
+               config_get_bool bgscan "$vif" bgscan
+               [ -n "$bgscan" ] && iwpriv "$ifname" bgscan "$bgscan"
 
-               config_get_bool antdiv "$device" diversity 1
-               sysctl -w dev."$device".diversity="$antdiv" >&-
+               config_get_bool antdiv "$device" diversity
+               [ -n "$antdiv" ] && sysctl -w dev."$device".diversity="$antdiv" >&-
 
                config_get antrx "$device" rxantenna
-               if [ -n "$antrx" ]; then
-                       sysctl -w dev."$device".rxantenna="$antrx" >&-
-               fi
+               [ -n "$antrx" ] && sysctl -w dev."$device".rxantenna="$antrx" >&-
 
                config_get anttx "$device" txantenna
-               if [ -n "$anttx" ]; then
-                       sysctl -w dev."$device".txantenna="$anttx" >&-
-               fi
+               [ -n "$anttx" ] && sysctl -w dev."$device".txantenna="$anttx" >&-
 
                config_get distance "$device" distance
-               if [ -n "$distance" ]; then
-                       athctrl -i "$device" -d "$distance" >&-
-               fi
+               [ -n "$distance" ] && athctrl -i "$device" -d "$distance" >&-
 
                config_get txpwr "$vif" txpower
-               if [ -n "$txpwr" ]; then
-                       iwconfig "$ifname" txpower "${txpwr%%.*}"
-               fi
+               [ -n "$txpwr" ] && iwconfig "$ifname" txpower "${txpwr%%.*}"
+
+               config_get rate "$vif" rate
+               [ -n "$rate" ] && iwconfig "$ifname" rate "${rate%%.*}"
+
+               config_get mcast_rate "$vif" mcast_rate
+               [ -n "$mcast_rate" ] && iwpriv "$ifname" mcast_rate "${mcast_rate%%.*}"
 
                config_get frag "$vif" frag
-               if [ -n "$frag" ]; then
-                       iwconfig "$ifname" frag "${frag%%.*}"
-               fi
+               [ -n "$frag" ] && iwconfig "$ifname" frag "${frag%%.*}"
 
                config_get rts "$vif" rts
-               if [ -n "$rts" ]; then
-                       iwconfig "$ifname" rts "${rts%%.*}"
-               fi
+               [ -n "$rts" ] && iwconfig "$ifname" rts "${rts%%.*}"
+
+               config_get_bool doth "$vif" 80211h
+               [ -n "$doth" ] && iwpriv "$ifname" doth "$doth"
+
+               config_get_bool comp "$vif" compression
+               [ -n "$comp" ] && iwpriv "$ifname" compression "$comp"
+
+               config_get_bool burst "$vif" bursting
+               [ -n "$burst" ] && iwpriv "$ifname" burst "$burst"
+
+               config_get_bool wmm "$vif" wmm
+               [ -n "$wmm" ] && iwpriv "$ifname" wmm "$wmm"
+
+               config_get_bool xr "$vif" xr
+               [ -n "$xr" ] && iwpriv "$ifname" xr "$xr"
+
+               config_get_bool ar "$vif" ar
+               [ -n "$ar" ] && iwpriv "$ifname" ar "$ar"
+
+               config_get_bool turbo "$vif" turbo
+               [ -n "$turbo" ] && iwpriv "$ifname" turbo "$turbo"
+
+               config_get_bool doth "$vif" doth 0
+               [ -n "$doth" ] && iwpriv "$ifname" doth "$doth"
+
+               config_get maclist "$vif" maclist
+               [ -n "$maclist" ] && {
+                       # flush MAC list
+                       iwpriv "$ifname" maccmd 3
+                       for mac in $maclist; do
+                               iwpriv "$ifname" addmac "$mac"
+                       done
+               }
+
+               config_get macpolicy "$vif" macpolicy
+               case "$macpolicy" in
+                       allow)
+                               iwpriv "$ifname" maccmd 1
+                       ;;
+                       deny)
+                               iwpriv "$ifname" maccmd 2
+                       ;;
+                       *)
+                               # default deny policy if mac list exists
+                               [ -n "$maclist" ] && iwpriv "$ifname" maccmd 2
+                       ;;
+               esac
 
                ifconfig "$ifname" up
                iwconfig "$ifname" channel "$channel" >/dev/null 2>/dev/null 
@@ -235,13 +280,12 @@ enable_atheros() {
                                                esac
                                                
                                                cat > /var/run/wpa_supplicant-$ifname.conf <<EOF
-ctrl_interface=/var/run/wpa_supplicant
 network={
        scan_ssid=1
        ssid="$ssid"
        key_mgmt=WPA-PSK
        $proto
-       psk="$passphrase"
+       psk=$passphrase
 }
 EOF
                                        ;;
@@ -266,7 +310,7 @@ detect_atheros() {
                cat <<EOF
 config wifi-device  $dev
        option type     atheros
-       option channel  5
+       option channel  auto
 
        # REMOVE THIS LINE TO ENABLE WIFI:
        option disabled 1