|
@@ -1700,7 +1700,6 @@ ath5k_check_ibss_tsf(struct ath5k_softc *sc, struct sk_buff *skb,
|
|
|
}
|
|
|
}
|
|
|
|
|
|
-
|
|
|
static void
|
|
|
ath5k_tasklet_rx(unsigned long data)
|
|
|
{
|
|
@@ -2216,6 +2215,7 @@ static void
|
|
|
ath5k_beacon_config(struct ath5k_softc *sc)
|
|
|
{
|
|
|
struct ath5k_hw *ah = sc->ah;
|
|
|
+ unsigned long flags;
|
|
|
|
|
|
ath5k_hw_set_imr(ah, 0);
|
|
|
sc->bmisscount = 0;
|
|
@@ -2237,9 +2237,9 @@ ath5k_beacon_config(struct ath5k_softc *sc)
|
|
|
|
|
|
if (sc->opmode == NL80211_IFTYPE_ADHOC) {
|
|
|
if (ath5k_hw_hasveol(ah)) {
|
|
|
- spin_lock(&sc->block);
|
|
|
+ spin_lock_irqsave(&sc->block, flags);
|
|
|
ath5k_beacon_send(sc);
|
|
|
- spin_unlock(&sc->block);
|
|
|
+ spin_unlock_irqrestore(&sc->block, flags);
|
|
|
}
|
|
|
} else
|
|
|
ath5k_beacon_update_timers(sc, -1);
|