summaryrefslogtreecommitdiffstats
path: root/package/madwifi/files/lib
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
commitf3e2fb3da0cf9179c2ded3621690bb46d529ce9a (patch)
treebb798e2ace5a5f3875766de3589f28d8a40c35a0 /package/madwifi/files/lib
parent6e9522d27e11d14df5acff0022fd3f894f997a7c (diff)
downloadmaster-31e0f0ae-f3e2fb3da0cf9179c2ded3621690bb46d529ce9a.tar.gz
master-31e0f0ae-f3e2fb3da0cf9179c2ded3621690bb46d529ce9a.tar.bz2
master-31e0f0ae-f3e2fb3da0cf9179c2ded3621690bb46d529ce9a.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)
SVN-Revision: 12993
Diffstat (limited to 'package/madwifi/files/lib')
-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})