Merge changes @2825 back to trunk

[madwifi/.git] / ath / if_ath.c

diff --git a/ath/if_ath.c b/ath/if_ath.c
index aac3584c3ad4c70c5698400385b59e6314e8dae1..7466f64d4c475c738308582c937373e1ab82fef6 100644 (file)
--- a/ath/if_ath.c
+++ b/ath/if_ath.c
@@ -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;
                }