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 | d5882b22a05971a3ae7c6bb27251efec262ff6b3 (patch) | |
| tree | cf4352948186606c60f36d435988f5817507fbe5 /package/madwifi/files | |
| parent | acb7f4883cff40b3dfa0450bef865a9d2f99428e (diff) | |
| download | upstream-d5882b22a05971a3ae7c6bb27251efec262ff6b3.tar.gz upstream-d5882b22a05971a3ae7c6bb27251efec262ff6b3.tar.bz2 upstream-d5882b22a05971a3ae7c6bb27251efec262ff6b3.zip | |
madwifi: turn software based tsf merging on by default, get rid of some iwpriv errors on wifi restart
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@16862 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/madwifi/files')
| -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" |