From f3e2fb3da0cf9179c2ded3621690bb46d529ce9a Mon Sep 17 00:00:00 2001
From: Felix Fietkau <nbd@openwrt.org>
Date: Thu, 16 Oct 2008 21:26:24 +0000
Subject: [PATCH] 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
---
 package/madwifi/files/lib/wifi/madwifi.sh | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

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})
-- 
2.30.2