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

Commit 04717ccd authored by Gabor Juhos's avatar Gabor Juhos Committed by John W. Linville
Browse files

ath9k: serialize ath9k_hw_setpower calls 



Because ath9k_setpower is called from various contexts, we have to
protect it against concurrent calls.

Changes-licensed-under: ISC
Signed-off-by: default avatarGabor Juhos <juhosg@openwrt.org>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent ebaa2453

drivers/net/wireless/ath/ath9k/ath9k.h

+1 −0
Original line number Diff line number Diff line
@@ -559,6 +559,7 @@ struct ath_softc { 
	spinlock_t sc_resetlock;

	spinlock_t sc_serial_rw;

	spinlock_t ani_lock;

	spinlock_t sc_pm_lock;

	struct mutex mutex;



	u8 curbssid[ETH_ALEN];

drivers/net/wireless/ath/ath9k/hw.c

+14 −1
Original line number Diff line number Diff line
@@ -2728,7 +2728,8 @@ static bool ath9k_hw_set_power_awake(struct ath_hw *ah, int setChip) 
	return true;

}



bool ath9k_hw_setpower(struct ath_hw *ah, enum ath9k_power_mode mode)

static bool ath9k_hw_setpower_nolock(struct ath_hw *ah,

				     enum ath9k_power_mode mode)

{

	int status = true, setChip = true;

	static const char *modes[] = {
@@ -2762,6 +2763,18 @@ bool ath9k_hw_setpower(struct ath_hw *ah, enum ath9k_power_mode mode) 
	return status;

}



bool ath9k_hw_setpower(struct ath_hw *ah, enum ath9k_power_mode mode)

{

	unsigned long flags;

	bool ret;



	spin_lock_irqsave(&ah->ah_sc->sc_pm_lock, flags);

	ret = ath9k_hw_setpower_nolock(ah, mode);

	spin_unlock_irqrestore(&ah->ah_sc->sc_pm_lock, flags);



	return ret;

}



/*

 * Helper for ASPM support.

 *

drivers/net/wireless/ath/ath9k/main.c

+1 −0
Original line number Diff line number Diff line
@@ -1316,6 +1316,7 @@ static int ath_init(u16 devid, struct ath_softc *sc) 
	spin_lock_init(&sc->sc_resetlock);

	spin_lock_init(&sc->sc_serial_rw);

	spin_lock_init(&sc->ani_lock);

	spin_lock_init(&sc->sc_pm_lock);

	mutex_init(&sc->mutex);

	tasklet_init(&sc->intr_tq, ath9k_tasklet, (unsigned long)sc);

	tasklet_init(&sc->bcon_tasklet, ath_beacon_tasklet,