fix mode setup for ibss/ahdemo - preserve existing modes and use HOSTAP mode for AHDEMO instead of IBSS to prevent unwanted IBSS merges

SVN-Revision: 12884
owl
Felix Fietkau 2008-10-07 01:40:09 +00:00
parent a5d8cfb520
commit 822c055850
1 changed files with 23 additions and 0 deletions

View File

@ -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 */