1
0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2025-04-21 12:27:27 +03:00

madwifi: preserve the interface mode correctly when using wds with sta separation

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@14195 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
nbd
2009-01-26 02:57:44 +00:00
parent 64730cf10a
commit 857bb5029f
14 changed files with 39 additions and 38 deletions

View File

@@ -1,6 +1,6 @@
--- a/ath/if_ath.c
+++ b/ath/if_ath.c
@@ -1451,6 +1451,23 @@ ath_vap_create(struct ieee80211com *ic,
@@ -1452,6 +1452,23 @@ ath_vap_create(struct ieee80211com *ic,
sc->sc_nstavaps++;
else if (opmode == IEEE80211_M_MONITOR)
sc->sc_nmonvaps++;
@@ -24,7 +24,7 @@
/*
* Adhoc demo mode is a pseudo mode; to the HAL it's
* just IBSS mode and the driver doesn't use management
@@ -4278,7 +4295,8 @@ ath_calcrxfilter(struct ath_softc *sc)
@@ -4279,7 +4296,8 @@ ath_calcrxfilter(struct ath_softc *sc)
if (ic->ic_opmode != IEEE80211_M_HOSTAP && (dev->flags & IFF_PROMISC))
rfilt |= HAL_RX_FILTER_PROM;
if (ic->ic_opmode == IEEE80211_M_STA ||
@@ -34,7 +34,7 @@
(sc->sc_nostabeacons) || sc->sc_scanning ||
(ic->ic_opmode == IEEE80211_M_HOSTAP))
rfilt |= HAL_RX_FILTER_BEACON;
@@ -6432,6 +6450,33 @@ ath_capture(struct net_device *dev, cons
@@ -6433,6 +6451,33 @@ ath_capture(struct net_device *dev, cons
}
/*
@@ -68,7 +68,7 @@
* Intercept management frames to collect beacon RSSI data and to do
* ibss merges. This function is called for all management frames,
* including those belonging to other BSS.
@@ -6484,10 +6529,19 @@ ath_recv_mgmt(struct ieee80211vap * vap,
@@ -6485,10 +6530,19 @@ ath_recv_mgmt(struct ieee80211vap * vap,
DPRINTF(sc, ATH_DEBUG_BEACON,
"Updated beacon timers\n");
}
@@ -92,7 +92,7 @@
}
/* NB: Fall Through */
case IEEE80211_FC0_SUBTYPE_PROBE_RESP:
@@ -6560,6 +6614,10 @@ ath_recv_mgmt(struct ieee80211vap * vap,
@@ -6561,6 +6615,10 @@ ath_recv_mgmt(struct ieee80211vap * vap,
#endif
if (do_merge)
ieee80211_ibss_merge(ni);