ath5k: use spin_lock_irqsave for beacon lock

upstream commit: b5f03956c56d72ad336e5c2c42a025f25d952c30

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>
Signed-off-by: Chris Wright <chrisw@sous-sol.org>

diff --git a/drivers/net/wireless/ath5k/base.c b/drivers/net/wireless/ath5k/base.c
index 1d77ee9d6e993225c74966b840d37607bde436ee..16f207c996c7bf33125f184df739f6013cdae8c7 100644 (file)
--- a/drivers/net/wireless/ath5k/base.c
+++ b/drivers/net/wireless/ath5k/base.c
@@ -1668,7 +1668,6 @@ ath5k_check_ibss_tsf(struct ath5k_softc *sc, struct sk_buff *skb,
        }
 }
 
-
 static void
 ath5k_tasklet_rx(unsigned long data)
 {
@@ -2188,6 +2187,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;
@@ -2211,9 +2211,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);