madwifi: turn software based tsf merging on by default, get rid of some iwpriv errors...
authorFelix Fietkau <nbd@openwrt.org>
Thu, 16 Jul 2009 11:30:01 +0000 (11:30 +0000)
committerFelix Fietkau <nbd@openwrt.org>
Thu, 16 Jul 2009 11:30:01 +0000 (11:30 +0000)
SVN-Revision: 16862

package/madwifi/files/lib/wifi/madwifi.sh

index fc692c0..6d10e24 100755 (executable)
@@ -134,10 +134,11 @@ enable_atheros() {
                config_get mode "$vif" mode
                
                case "$mode" in
-                       sta) config_get nosbeacon "$device" nosbeacon;;
-                       adhoc) config_get nosbeacon "$vif" sw_merge;;
+                       sta) config_get_bool nosbeacon "$device" nosbeacon;;
+                       adhoc) config_get_bool nosbeacon "$vif" sw_merge 1;;
                esac
                
+               [ "$nosbeacon" = 1 ] || nosbeacon=""
                ifname=$(wlanconfig "$ifname" create wlandev "$device" wlanmode "$mode" ${nosbeacon:+nosbeacon})
                [ $? -ne 0 ] && {
                        echo "enable_atheros($device): Failed to set up $mode vif $ifname" >&2
@@ -178,7 +179,7 @@ enable_atheros() {
                        1|on|enabled) wds=1;;
                        *) wds=0;;
                esac
-               iwpriv "$ifname" wds "$wds"
+               iwpriv "$ifname" wds "$wds" >/dev/null 2>&1
 
                [ "$mode" = ap -a "$wds" = 1 ] && {
                        config_get_bool wdssep "$vif" wdssep 1
@@ -229,7 +230,7 @@ enable_atheros() {
                [ -n "$rts" ] && iwconfig "$ifname" rts "${rts%%.*}"
 
                config_get_bool comp "$vif" compression 0
-               iwpriv "$ifname" compression "$comp"
+               iwpriv "$ifname" compression "$comp" >/dev/null 2>&1
 
                config_get_bool minrate "$vif" minrate
                [ -n "$minrate" ] && iwpriv "$ifname" minrate "$minrate"