add fragmentation and rts settings thanks rene closes #1725

[openwrt/svn-archive/archive.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 69874b5c1873a70c2851c6a321d5aa9b7276feb3..69506dbde5e9c247350ac931da9cea178ff39269 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 }"
 }
 
 
@@ -103,14 +104,18 @@ enable_atheros() {
                        esac
                        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" >/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;;
@@ -142,16 +147,14 @@ enable_atheros() {
                                config_get addr "$vif" bssid
                                iwpriv "$ifname" wds_add "$addr"
                        ;;
-                       *)
-                               config_get ssid "$vif" ssid
-                       ;;
-                       adhoc)
+                       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
@@ -181,6 +184,16 @@ 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 
 
@@ -194,6 +207,9 @@ enable_atheros() {
                iwconfig "$ifname" essid "$ssid"
                case "$mode" in
                        ap)
+                               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
@@ -262,6 +278,8 @@ config wifi-iface
        option hidden   0
 #      option txpower  15
 #      option bgscan   enable
+#      option frag     off
+#      option rts      off
        option encryption none
 
 EOF