diff options
| author | Kalle Valo <kvalo@codeaurora.org> | 2015-05-25 15:12:21 +0300 |
|---|---|---|
| committer | Kalle Valo <kvalo@codeaurora.org> | 2015-05-25 15:12:21 +0300 |
| commit | 1d36f46b4e61ae7bd2ce013317cb3ca0298bbb6e (patch) | |
| tree | b330373ae4216c4e4e8da9cd2137154e2b76e78c /drivers/net/wireless/ath/ath10k/mac.c | |
| parent | 01b6961410b76af228eb993220024ff6db6ba80c (diff) | |
| parent | 48f4ca34f36bb947d8a7cd4ff8c8e282f14d51e6 (diff) | |
| download | blackbird-op-linux-1d36f46b4e61ae7bd2ce013317cb3ca0298bbb6e.tar.gz blackbird-op-linux-1d36f46b4e61ae7bd2ce013317cb3ca0298bbb6e.zip | |
Merge ath-next from ath.git
Major changes:
ath10k:
* qca6174 power consumption improvements, enable ASPM etc (Michal)
wil6210:
* support Wi-Fi Simple Configuration in STA mode
Diffstat (limited to 'drivers/net/wireless/ath/ath10k/mac.c')
| -rw-r--r-- | drivers/net/wireless/ath/ath10k/mac.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/drivers/net/wireless/ath/ath10k/mac.c b/drivers/net/wireless/ath/ath10k/mac.c index 539b2b62b58a..0ed422ae46a4 100644 --- a/drivers/net/wireless/ath/ath10k/mac.c +++ b/drivers/net/wireless/ath/ath10k/mac.c @@ -1708,7 +1708,14 @@ static int ath10k_mac_vif_setup_ps(struct ath10k_vif *arvif) enable_ps = false; } - if (enable_ps) { + if (!arvif->is_started) { + /* mac80211 can update vif powersave state while disconnected. + * Firmware doesn't behave nicely and consumes more power than + * necessary if PS is disabled on a non-started vdev. Hence + * force-enable PS for non-running vdevs. + */ + psmode = WMI_STA_PS_MODE_ENABLED; + } else if (enable_ps) { psmode = WMI_STA_PS_MODE_ENABLED; param = WMI_STA_PS_PARAM_INACTIVITY_TIME; |
