Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b5f03956 authored by Bob Copeland's avatar Bob Copeland Committed by John W. Linville
Browse files

ath5k: use spin_lock_irqsave for beacon lock 



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: default avatarBob Copeland <me@bobcopeland.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 0b6f582b

drivers/net/wireless/ath5k/base.c

+3 −3
Original line number Diff line number Diff line
@@ -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);