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

[openwrt/openwrt.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 9c16d59987f139961094b951037e3c0dd964c413..638e7746642d59be22e000e05065457428996909 100644 (file)
--- a/package/kernel/mac80211/patches/521-ath9k_cur_txpower.patch
+++ b/package/kernel/mac80211/patches/521-ath9k_cur_txpower.patch
@@ -1,6 +1,6 @@
 --- a/drivers/net/wireless/ath/ath9k/main.c
 +++ b/drivers/net/wireless/ath/ath9k/main.c
-@@ -323,8 +323,12 @@ int ath_reset_internal(struct ath_softc 
+@@ -326,8 +326,12 @@ static int ath_reset_internal(struct ath
            sc->cur_chan->offchannel)
                ath9k_mci_set_txpower(sc, true, false);
  
@@ -14,7 +14,7 @@
  
  out:
        spin_unlock_bh(&sc->sc_pcu_lock);
-@@ -1453,6 +1457,7 @@ static int ath9k_config(struct ieee80211
+@@ -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->cur_chan->txpower, &sc->curtxpow);