From: Johannes Berg <johannes.berg@intel.com>
Date: Wed, 13 Nov 2013 16:16:19 +0000 (+0100)
Subject: iwlwifi: mvm: disable powersave in low-latency
X-Git-Tag: Ubuntu-snapdragon-4.4.0-1029.32~8994^2~289^2^2~102^2~52
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=e03f9bef2f9de4295df91a235c6b521dd64ef655;p=mirror_ubuntu-zesty-kernel.git

iwlwifi: mvm: disable powersave in low-latency

While an interface is in low-latency mode, for now powersave
should be disabled for it, so take low-latency into account
in the powersave code and force powersave recalculation when
low-latency mode changes.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
---

diff --git a/drivers/net/wireless/iwlwifi/mvm/power.c b/drivers/net/wireless/iwlwifi/mvm/power.c
index d9eab3b7bb9f..436c7e0ae6b1 100644
--- a/drivers/net/wireless/iwlwifi/mvm/power.c
+++ b/drivers/net/wireless/iwlwifi/mvm/power.c
@@ -312,7 +312,8 @@ static void iwl_mvm_power_build_cmd(struct iwl_mvm *mvm,
 	    mvmvif->dbgfs_pm.disable_power_off)
 		cmd->flags &= cpu_to_le16(~POWER_FLAGS_POWER_SAVE_ENA_MSK);
 #endif
-	if (!vif->bss_conf.ps || mvmvif->pm_prevented)
+	if (!vif->bss_conf.ps || mvmvif->pm_prevented ||
+	    iwl_mvm_vif_low_latency(mvmvif))
 		return;
 
 	cmd->flags |= cpu_to_le16(POWER_FLAGS_POWER_MANAGEMENT_ENA_MSK);
diff --git a/drivers/net/wireless/iwlwifi/mvm/utils.c b/drivers/net/wireless/iwlwifi/mvm/utils.c
index e2cc876d9388..790da1bea25e 100644
--- a/drivers/net/wireless/iwlwifi/mvm/utils.c
+++ b/drivers/net/wireless/iwlwifi/mvm/utils.c
@@ -541,10 +541,14 @@ int iwl_mvm_update_low_latency(struct iwl_mvm *mvm, struct ieee80211_vif *vif,
 			       bool value)
 {
 	struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);
+	int res;
 
 	lockdep_assert_held(&mvm->mutex);
 
 	mvmvif->low_latency = value;
 
-	return iwl_mvm_update_quotas(mvm, NULL);
+	res = iwl_mvm_update_quotas(mvm, NULL);
+	if (res)
+		return res;
+	return iwl_mvm_power_update_mode(mvm, vif);
 }