aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/ath5k
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/wireless/ath5k')
-rw-r--r--drivers/net/wireless/ath5k/base.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/wireless/ath5k/base.c b/drivers/net/wireless/ath5k/base.c
index d930c10a7e52..8e5620afd2f9 100644
--- a/drivers/net/wireless/ath5k/base.c
+++ b/drivers/net/wireless/ath5k/base.c
@@ -1700,7 +1700,6 @@ ath5k_check_ibss_tsf(struct ath5k_softc *sc, struct sk_buff *skb,
1700 } 1700 }
1701} 1701}
1702 1702
1703
1704static void 1703static void
1705ath5k_tasklet_rx(unsigned long data) 1704ath5k_tasklet_rx(unsigned long data)
1706{ 1705{
@@ -2216,6 +2215,7 @@ static void
2216ath5k_beacon_config(struct ath5k_softc *sc) 2215ath5k_beacon_config(struct ath5k_softc *sc)
2217{ 2216{
2218 struct ath5k_hw *ah = sc->ah; 2217 struct ath5k_hw *ah = sc->ah;
2218 unsigned long flags;
2219 2219
2220 ath5k_hw_set_imr(ah, 0); 2220 ath5k_hw_set_imr(ah, 0);
2221 sc->bmisscount = 0; 2221 sc->bmisscount = 0;
@@ -2237,9 +2237,9 @@ ath5k_beacon_config(struct ath5k_softc *sc)
2237 2237
2238 if (sc->opmode == NL80211_IFTYPE_ADHOC) { 2238 if (sc->opmode == NL80211_IFTYPE_ADHOC) {
2239 if (ath5k_hw_hasveol(ah)) { 2239 if (ath5k_hw_hasveol(ah)) {
2240 spin_lock(&sc->block); 2240 spin_lock_irqsave(&sc->block, flags);
2241 ath5k_beacon_send(sc); 2241 ath5k_beacon_send(sc);
2242 spin_unlock(&sc->block); 2242 spin_unlock_irqrestore(&sc->block, flags);
2243 } 2243 }
2244 } else 2244 } else
2245 ath5k_beacon_update_timers(sc, -1); 2245 ath5k_beacon_update_timers(sc, -1);