aboutsummaryrefslogtreecommitdiffstats
path: root/package/madwifi/patches/370-wdsvap.patch
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2009-01-26 02:57:44 +0000
committerFelix Fietkau <nbd@openwrt.org>2009-01-26 02:57:44 +0000
commit10e3ea9f129ce908abf7e1e73e318aef7d2f5e16 (patch)
tree840783aaef7ea3ed398f31e98b86b5b90d5c1331 /package/madwifi/patches/370-wdsvap.patch
parentf561b910e8d47b4b488fd37a389c2973649a23fd (diff)
downloadupstream-10e3ea9f129ce908abf7e1e73e318aef7d2f5e16.tar.gz
upstream-10e3ea9f129ce908abf7e1e73e318aef7d2f5e16.tar.bz2
upstream-10e3ea9f129ce908abf7e1e73e318aef7d2f5e16.zip
madwifi: preserve the interface mode correctly when using wds with sta separation
SVN-Revision: 14195
Diffstat (limited to 'package/madwifi/patches/370-wdsvap.patch')
-rw-r--r--package/madwifi/patches/370-wdsvap.patch9
1 files changed, 5 insertions, 4 deletions
diff --git a/package/madwifi/patches/370-wdsvap.patch b/package/madwifi/patches/370-wdsvap.patch
index 94d75f0411..d1f255d6c7 100644
--- a/package/madwifi/patches/370-wdsvap.patch
+++ b/package/madwifi/patches/370-wdsvap.patch
@@ -44,12 +44,13 @@
if (ic->ic_dev->flags & IFF_RUNNING) {
/* needs to disable hardware too */
-@@ -1271,8 +1269,11 @@ ath_vap_create(struct ieee80211com *ic,
+@@ -1271,8 +1269,12 @@ ath_vap_create(struct ieee80211com *ic,
} else
ic_opmode = opmode;
break;
- case IEEE80211_M_HOSTAP:
case IEEE80211_M_WDS:
++ ic_opmode = ic->ic_opmode;
+ if (!master)
+ return NULL;
+ break;
@@ -57,7 +58,7 @@
/* permit multiple APs and/or WDS links */
/* XXX sta+ap for repeater/bridge application */
if ((sc->sc_nvaps != 0) && (ic->ic_opmode == IEEE80211_M_STA))
-@@ -1304,7 +1305,7 @@ ath_vap_create(struct ieee80211com *ic,
+@@ -1304,7 +1306,7 @@ ath_vap_create(struct ieee80211com *ic,
}
avp = dev->priv;
@@ -66,7 +67,7 @@
/* override with driver methods */
vap = &avp->av_vap;
avp->av_newstate = vap->iv_newstate;
-@@ -4209,8 +4210,7 @@ ath_calcrxfilter(struct ath_softc *sc)
+@@ -4209,8 +4211,7 @@ ath_calcrxfilter(struct ath_softc *sc)
if (ic->ic_opmode == IEEE80211_M_STA ||
sc->sc_opmode == HAL_M_IBSS || /* NB: AHDEMO too */
(sc->sc_nostabeacons) || sc->sc_scanning ||
@@ -76,7 +77,7 @@
rfilt |= HAL_RX_FILTER_BEACON;
if (sc->sc_nmonvaps > 0)
rfilt |= (HAL_RX_FILTER_CONTROL | HAL_RX_FILTER_BEACON |
-@@ -9030,8 +9030,6 @@ ath_calibrate(unsigned long arg)
+@@ -9030,8 +9031,6 @@ ath_calibrate(unsigned long arg)
* set sc->beacons if we might need to restart
* them after ath_reset. */
if (!sc->sc_beacons &&