Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

[linux.git] / drivers / net / wireless / ath / ath9k / beacon.c

diff --git a/drivers/net/wireless/ath/ath9k/beacon.c b/drivers/net/wireless/ath/ath9k/beacon.c
index 471e0f624e8116e07e5bda86744ba422ca8e4fea..bd9e634879e69d4b2b33d741f7c4a8c51801ba9f 100644 (file)
--- a/drivers/net/wireless/ath/ath9k/beacon.c
+++ b/drivers/net/wireless/ath/ath9k/beacon.c
@@ -312,10 +312,9 @@ static void ath9k_csa_update_vif(void *data, u8 *mac, struct ieee80211_vif *vif)
 
 void ath9k_csa_update(struct ath_softc *sc)
 {
 
 void ath9k_csa_update(struct ath_softc *sc)
 {

-       ieee80211_iterate_active_interfaces(sc->hw,
-                                           IEEE80211_IFACE_ITER_NORMAL,
-                                           ath9k_csa_update_vif,
-                                           sc);
+       ieee80211_iterate_active_interfaces_atomic(sc->hw,
+                                                  IEEE80211_IFACE_ITER_NORMAL,
+                                                  ath9k_csa_update_vif, sc);

 }
 
 void ath9k_beacon_tasklet(unsigned long data)
 }
 
 void ath9k_beacon_tasklet(unsigned long data)