Merge changes @2825 back to trunk

git-svn-id: http://madwifi-project.org/svn/madwifi/trunk@2826 0192ed92-7a03-0410-a25b-9323aeb14dbd
This commit is contained in:
benoit 2007-11-04 16:17:39 +00:00
parent b42f24aaf1
commit c4d1172910

View File

@ -8322,8 +8322,8 @@ ath_newstate(struct ieee80211vap *vap, enum ieee80211_state nstate, int arg)
/* XXX: if it is SCAN state, disable beacons. */
if (nstate == IEEE80211_S_SCAN) {
ath_hal_intrset(ah, sc->sc_imask &~ (HAL_INT_SWBA | HAL_INT_BMISS));
sc->sc_imask &= ~(HAL_INT_SWBA | HAL_INT_BMISS);
ath_hal_intrset(ah, sc->sc_imask);
/* need to reconfigure the beacons when it moves to RUN */
sc->sc_beacons = 0;
}