Skip to content

Commit

Permalink
ath5k: use spin_lock_irqsave for beacon lock
Browse files Browse the repository at this point in the history
ath5k_reset can be called from process context, which in turn can
call ath5k_beacon_config which takes the sc->block spinlock.  Since
it can also be taken in hard irq context, use spin_lock_irqsave
everywhere.  This fixes a potential deadlock in adhoc mode.

Changes-licensed-under: 3-Clause-BSD

Cc: stable@kernel.org
Signed-off-by: Bob Copeland <me@bobcopeland.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
  • Loading branch information
Bob Copeland authored and John W. Linville committed Feb 27, 2009
1 parent 0b6f582 commit b5f0395
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions drivers/net/wireless/ath5k/base.c
Original file line number Diff line number Diff line change
Expand Up @@ -1700,7 +1700,6 @@ ath5k_check_ibss_tsf(struct ath5k_softc *sc, struct sk_buff *skb,
}
}


static void
ath5k_tasklet_rx(unsigned long data)
{
Expand Down Expand Up @@ -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;
Expand All @@ -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);
Expand Down

0 comments on commit b5f0395

Please sign in to comment.