aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/ath/ath5k/mac80211-ops.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/wireless/ath/ath5k/mac80211-ops.c')
-rw-r--r--drivers/net/wireless/ath/ath5k/mac80211-ops.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/wireless/ath/ath5k/mac80211-ops.c b/drivers/net/wireless/ath/ath5k/mac80211-ops.c
index c89fa6ead615..df61a09adb6d 100644
--- a/drivers/net/wireless/ath/ath5k/mac80211-ops.c
+++ b/drivers/net/wireless/ath/ath5k/mac80211-ops.c
@@ -255,7 +255,6 @@ ath5k_bss_info_changed(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
255 struct ath5k_vif *avf = (void *)vif->drv_priv; 255 struct ath5k_vif *avf = (void *)vif->drv_priv;
256 struct ath5k_hw *ah = hw->priv; 256 struct ath5k_hw *ah = hw->priv;
257 struct ath_common *common = ath5k_hw_common(ah); 257 struct ath_common *common = ath5k_hw_common(ah);
258 unsigned long flags;
259 258
260 mutex_lock(&ah->lock); 259 mutex_lock(&ah->lock);
261 260
@@ -301,9 +300,9 @@ ath5k_bss_info_changed(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
301 } 300 }
302 301
303 if (changes & BSS_CHANGED_BEACON) { 302 if (changes & BSS_CHANGED_BEACON) {
304 spin_lock_irqsave(&ah->block, flags); 303 spin_lock_bh(&ah->block);
305 ath5k_beacon_update(hw, vif); 304 ath5k_beacon_update(hw, vif);
306 spin_unlock_irqrestore(&ah->block, flags); 305 spin_unlock_bh(&ah->block);
307 } 306 }
308 307
309 if (changes & BSS_CHANGED_BEACON_ENABLED) 308 if (changes & BSS_CHANGED_BEACON_ENABLED)