ath9k: merge a fix for queue start/stop handling (fixes #18164, #18130)

[openwrt/staging/wigyori.git] / package / kernel / mac80211 / patches / 521-ath9k_cur_txpower.patch

diff --git a/package/kernel/mac80211/patches/521-ath9k_cur_txpower.patch b/package/kernel/mac80211/patches/521-ath9k_cur_txpower.patch
index ab59411db9d9c85283b39d20001a7f6522416a13..638e7746642d59be22e000e05065457428996909 100644 (file)
--- a/package/kernel/mac80211/patches/521-ath9k_cur_txpower.patch
+++ b/package/kernel/mac80211/patches/521-ath9k_cur_txpower.patch
@@ -1,7 +1,7 @@
 --- a/drivers/net/wireless/ath/ath9k/main.c
 +++ b/drivers/net/wireless/ath/ath9k/main.c
-@@ -313,8 +313,12 @@ static int ath_reset_internal(struct ath
-           (sc->hw->conf.flags & IEEE80211_CONF_OFFCHANNEL))
+@@ -326,8 +326,12 @@ static int ath_reset_internal(struct ath
+           sc->cur_chan->offchannel)
                ath9k_mci_set_txpower(sc, true, false);
  
 -      if (!ath_complete_reset(sc, true))
@@ -14,10 +14,10 @@
  
  out:
        spin_unlock_bh(&sc->sc_pcu_lock);
-@@ -1340,6 +1344,7 @@ static int ath9k_config(struct ieee80211
-               sc->config.txpowlimit = 2 * conf->power_level;
+@@ -1473,6 +1477,7 @@ static int ath9k_config(struct ieee80211
+               sc->cur_chan->txpower = 2 * conf->power_level;
                ath9k_cmn_update_txpow(ah, sc->curtxpow,
-                                      sc->config.txpowlimit, &sc->curtxpow);
+                                      sc->cur_chan->txpower, &sc->curtxpow);
 +              hw->cur_power_level = sc->curtxpow / 2;
        }