diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2009-07-16 11:30:01 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2009-07-16 11:30:01 +0000 |
| commit | 3d2040de0ffa3cf2005779f9fbf48f6f120a099d (patch) | |
| tree | 7ef52be7679cc5c2347f35a1601a81e9e8b64560 /package/madwifi/files/lib | |
| parent | f97def736787ba3fd85203de8f6d20d5fdb91c94 (diff) | |
| download | upstream-3d2040de0ffa3cf2005779f9fbf48f6f120a099d.tar.gz upstream-3d2040de0ffa3cf2005779f9fbf48f6f120a099d.tar.bz2 upstream-3d2040de0ffa3cf2005779f9fbf48f6f120a099d.zip | |
madwifi: turn software based tsf merging on by default, get rid of some iwpriv errors on wifi restart
SVN-Revision: 16862
Diffstat (limited to 'package/madwifi/files/lib')
| -rwxr-xr-x | package/madwifi/files/lib/wifi/madwifi.sh | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/package/madwifi/files/lib/wifi/madwifi.sh b/package/madwifi/files/lib/wifi/madwifi.sh index fc692c0221..6d10e24f85 100755 --- a/package/madwifi/files/lib/wifi/madwifi.sh +++ b/package/madwifi/files/lib/wifi/madwifi.sh @@ -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" |