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

Commit 783cd01e authored by Felix Fietkau's avatar Felix Fietkau Committed by John W. Linville
Browse files

ath9k: add missing ps wakeup/restore calls 



There are several places where ath_reset() was called without proper
calls to ath9k_ps_wakeup/ath9k_ps_restore. To fix this, add those calls
directly to ath_reset and drop them from callers where it makes sense.

Also add them to the config callback around ath_update_txpow to fix a
crash that happens when the tx power changed before any vif is brought up.

Signed-off-by: default avatarFelix Fietkau <nbd@openwrt.org>
Cc: stable@kernel.org
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 6f481010

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

+5 −3
Original line number Diff line number Diff line
@@ -592,14 +592,12 @@ void ath9k_tasklet(unsigned long data) 
	u32 status = sc->intrstatus;

	u32 rxmask;



	ath9k_ps_wakeup(sc);



	if (status & ATH9K_INT_FATAL) {

		ath_reset(sc, true);

		ath9k_ps_restore(sc);

		return;

	}



	ath9k_ps_wakeup(sc);

	spin_lock(&sc->sc_pcu_lock);



	if (!ath9k_hw_check_alive(ah))
@@ -969,6 +967,7 @@ int ath_reset(struct ath_softc *sc, bool retry_tx) 
	/* Stop ANI */

	del_timer_sync(&common->ani.timer);



	ath9k_ps_wakeup(sc);

	spin_lock_bh(&sc->sc_pcu_lock);



	ieee80211_stop_queues(hw);
@@ -1015,6 +1014,7 @@ int ath_reset(struct ath_softc *sc, bool retry_tx) 


	/* Start ANI */

	ath_start_ani(common);

	ath9k_ps_restore(sc);



	return r;

}
@@ -1701,7 +1701,9 @@ static int ath9k_config(struct ieee80211_hw *hw, u32 changed) 
skip_chan_change:

	if (changed & IEEE80211_CONF_CHANGE_POWER) {

		sc->config.txpowlimit = 2 * conf->power_level;

		ath9k_ps_wakeup(sc);

		ath_update_txpow(sc);

		ath9k_ps_restore(sc);

	}



	spin_lock_bh(&sc->wiphy_lock);

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

+0 −2
Original line number Diff line number Diff line
@@ -2113,9 +2113,7 @@ static void ath_tx_complete_poll_work(struct work_struct *work) 
	if (needreset) {

		ath_dbg(ath9k_hw_common(sc->sc_ah), ATH_DBG_RESET,

			"tx hung, resetting the chip\n");

		ath9k_ps_wakeup(sc);

		ath_reset(sc, true);

		ath9k_ps_restore(sc);

	}



	ieee80211_queue_delayed_work(sc->hw, &sc->tx_complete_work,