diff options
| author | Kalle Valo <kvalo@codeaurora.org> | 2020-03-16 07:29:55 +0200 |
|---|---|---|
| committer | Kalle Valo <kvalo@codeaurora.org> | 2020-03-16 07:29:55 +0200 |
| commit | 377c0a94ad1cf005c47d7a502d1f8e46fbcf747a (patch) | |
| tree | 29dd99c705accc1063d56a85da57cf43c0cca6c2 /drivers/net/wireless/ath/ath9k/main.c | |
| parent | ca44e47a2b8611178d38d4ed9532f793cf4244a8 (diff) | |
| parent | dfb252c7b680b0d1f88aa0af0b54577fd29ac525 (diff) | |
Merge ath-next from git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git
ath.git patches for v5.7. Major changes:
ath10k
* support for getting btcoex settings from Device Tree
* support QCA9377 SDIO device
ath11k
* add HE rate accounting
* add thermal sensor and cooling devices
Diffstat (limited to 'drivers/net/wireless/ath/ath9k/main.c')
| -rw-r--r-- | drivers/net/wireless/ath/ath9k/main.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/net/wireless/ath/ath9k/main.c b/drivers/net/wireless/ath/ath9k/main.c index 983b6d6c89f0..457e9b0d21ca 100644 --- a/drivers/net/wireless/ath/ath9k/main.c +++ b/drivers/net/wireless/ath/ath9k/main.c @@ -1460,6 +1460,9 @@ static int ath9k_config(struct ieee80211_hw *hw, u32 changed) ath_chanctx_set_channel(sc, ctx, &hw->conf.chandef); } + if (changed & IEEE80211_CONF_CHANGE_POWER) + ath9k_set_txpower(sc, NULL); + mutex_unlock(&sc->mutex); ath9k_ps_restore(sc); |