aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2008-10-16 21:26:24 +0000
committerFelix Fietkau <nbd@openwrt.org>2008-10-16 21:26:24 +0000
commit836ae80bb1cdbc0b291b6dc1031c72d46f613f80 (patch)
tree925ca2e4bcc86adfbbe793dc2fb4fd803fb53635
parent408a8518ac15e032875f68b3856ce69ea52f7657 (diff)
downloadupstream-836ae80bb1cdbc0b291b6dc1031c72d46f613f80.tar.gz
upstream-836ae80bb1cdbc0b291b6dc1031c72d46f613f80.tar.bz2
upstream-836ae80bb1cdbc0b291b6dc1031c72d46f613f80.zip
madwifi: allow disabling of hardware ibss merges by setting the wifi-iface option sw_merge, which does the tsf sync in software instead. used to work around hardware issues with hw merges (ATIM window gets screwed up)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@12993 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rwxr-xr-xpackage/madwifi/files/lib/wifi/madwifi.sh5
1 files changed, 4 insertions, 1 deletions
diff --git a/package/madwifi/files/lib/wifi/madwifi.sh b/package/madwifi/files/lib/wifi/madwifi.sh
index df345316b5..e4e99822bd 100755
--- a/package/madwifi/files/lib/wifi/madwifi.sh
+++ b/package/madwifi/files/lib/wifi/madwifi.sh
@@ -85,7 +85,10 @@ enable_atheros() {
config_get eap_type "$vif" eap_type
config_get mode "$vif" mode
- [ "$mode" = sta ] && config_get nosbeacon "$device" nosbeacon
+ case "$mode" in
+ sta) config_get nosbeacon "$device" nosbeacon;;
+ adhoc) config_get nosbeacon "$vif" sw_merge;;
+ esac
config_get ifname "$vif" ifname
ifname=$(wlanconfig "$ifname" create wlandev "$device" wlanmode "$mode" ${nosbeacon:+nosbeacon})