aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2008-10-07 01:40:09 +0000
committerFelix Fietkau <nbd@openwrt.org>2008-10-07 01:40:09 +0000
commit822c05585018d3115b95cf64514a64785db10e89 (patch)
tree49573d9346fa88698d105f50b2c278f7bb96189c
parenta5d8cfb5208ba867d2bd9f3ba4c73e287e3f07de (diff)
downloadupstream-822c05585018d3115b95cf64514a64785db10e89.tar.gz
upstream-822c05585018d3115b95cf64514a64785db10e89.tar.bz2
upstream-822c05585018d3115b95cf64514a64785db10e89.zip
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
-rw-r--r--package/madwifi/patches/381-ibss_modes.patch23
1 files changed, 23 insertions, 0 deletions
diff --git a/package/madwifi/patches/381-ibss_modes.patch b/package/madwifi/patches/381-ibss_modes.patch
new file mode 100644
index 0000000000..1ce295eea3
--- /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 */
+