From 14b88b01e841ee49c3ed9564f226aaffbff9cd65 Mon Sep 17 00:00:00 2001
From: nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Tue, 7 Oct 2008 01:40:09 +0000
Subject: [PATCH] fix mode setup for ibss/ahdemo - preserve existing modes and
 use HOSTAP mode for AHDEMO instead of IBSS to prevent unwanted IBSS merges

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@12884 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 package/madwifi/patches/381-ibss_modes.patch | 23 ++++++++++++++++++++
 1 file changed, 23 insertions(+)
 create mode 100644 package/madwifi/patches/381-ibss_modes.patch

diff --git a/package/madwifi/patches/381-ibss_modes.patch b/package/madwifi/patches/381-ibss_modes.patch
new file mode 100644
index 000000000..1ce295eea
--- /dev/null
+++ b/package/madwifi/patches/381-ibss_modes.patch
@@ -0,0 +1,23 @@
+--- a/ath/if_ath.c
++++ b/ath/if_ath.c
+@@ -1260,7 +1260,10 @@
+ 	case IEEE80211_M_IBSS:
+ 		if ((sc->sc_nvaps != 0) && (ic->ic_opmode == IEEE80211_M_STA))
+ 			return NULL;
+-		ic_opmode = opmode;
++		if (ic->ic_opmode == IEEE80211_M_HOSTAP)
++			ic_opmode = ic->ic_opmode;
++		else
++			ic_opmode = opmode;
+ 		break;
+ 	case IEEE80211_M_AHDEMO:
+ 	case IEEE80211_M_MONITOR:
+@@ -1455,7 +1458,7 @@
+ 	 * frames.  Other modes carry over directly to the HAL.
+ 	 */
+ 	if (ic->ic_opmode == IEEE80211_M_AHDEMO)
+-		sc->sc_opmode = HAL_M_IBSS;
++		sc->sc_opmode = HAL_M_HOSTAP;
+ 	else
+ 		sc->sc_opmode = (HAL_OPMODE) ic->ic_opmode;	/* NB: compatible */
+