Author: adrian
Date: Fri Mar 2 02:57:10 2012
New Revision: 232374
URL: http://svn.freebsd.org/changeset/base/232374
Log:
Wrap the scan code state change stuff behind ATH_LOCK and the PCU fiddling
behind the PCU lock.
sc_scanning is being checked without ATH_LOCK behind held and could
in theory run from multiple threads.
Modified:
head/sys/dev/ath/if_ath.c
Modified: head/sys/dev/ath/if_ath.c
==============================================================================
--- head/sys/dev/ath/if_ath.c Fri Mar 2 02:53:43 2012 (r232373)
+++ head/sys/dev/ath/if_ath.c Fri Mar 2 02:57:10 2012 (r232374)
@@ -5637,11 +5637,16 @@ ath_scan_start(struct ieee80211com *ic)
/* XXX calibration timer? */
+ ATH_LOCK(sc);
sc->sc_scanning = 1;
sc->sc_syncbeacon = 0;
rfilt = ath_calcrxfilter(sc);
+ ATH_UNLOCK(sc);
+
+ ATH_PCU_LOCK(sc);
ath_hal_setrxfilter(ah, rfilt);
ath_hal_setassocid(ah, ifp->if_broadcastaddr, 0);
+ ATH_PCU_UNLOCK(sc);
DPRINTF(sc, ATH_DEBUG_STATE, "%s: RX filter 0x%x bssid %s aid 0\n",
__func__, rfilt, ether_sprintf(ifp->if_broadcastaddr));
@@ -5655,12 +5660,17 @@ ath_scan_end(struct ieee80211com *ic)
struct ath_hal *ah = sc->sc_ah;
u_int32_t rfilt;
+ ATH_LOCK(sc);
sc->sc_scanning = 0;
rfilt = ath_calcrxfilter(sc);
+ ATH_UNLOCK(sc);
+
+ ATH_PCU_LOCK(sc);
ath_hal_setrxfilter(ah, rfilt);
ath_hal_setassocid(ah, sc->sc_curbssid, sc->sc_curaid);
ath_hal_process_noisefloor(ah);
+ ATH_PCU_UNLOCK(sc);
DPRINTF(sc, ATH_DEBUG_STATE, "%s: RX filter 0x%x bssid %s aid 0x%x\n",
__func__, rfilt, ether_sprintf(sc->sc_curbssid),
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
