madwifi: turn software based tsf merging on by default, get rid of some iwpriv errors on wifi restart

SVN-Revision: 16862
owl
Felix Fietkau 2009-07-16 11:30:01 +00:00
parent f97def7367
commit 3d2040de0f
1 changed files with 5 additions and 4 deletions

View File

@ -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"