iwlwifi: mvm: don't look at power commmand to decide if power is enabled

Reviewed-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 f9ddd798ccd59ac5109269acfe1e9dbc6f5d5736..20bc37648faf44910fc7b5a987b34b76b8124070 100644 (file)
--- a/drivers/net/wireless/iwlwifi/mvm/power.c
+++ b/drivers/net/wireless/iwlwifi/mvm/power.c
@@ -423,6 +423,7 @@ static int iwl_mvm_power_mac_update_mode(struct iwl_mvm *mvm,
        int ret;
        bool ba_enable;
        struct iwl_mac_power_cmd cmd = {};
+       struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);
 
        if (vif->type != NL80211_IFTYPE_STATION)
                return 0;
@@ -439,8 +440,9 @@ static int iwl_mvm_power_mac_update_mode(struct iwl_mvm *mvm,
        if (ret)
                return ret;
 
-       ba_enable = !!(cmd.flags &
-                      cpu_to_le16(POWER_FLAGS_POWER_MANAGEMENT_ENA_MSK));
+       ba_enable = !(iwlmvm_mod_params.power_scheme == IWL_POWER_SCHEME_CAM ||
+                     mvm->ps_prevented || mvm->bound_vif_cnt > 1 ||
+                     !vif->bss_conf.ps || iwl_mvm_vif_low_latency(mvmvif));
 
        return iwl_mvm_update_beacon_abort(mvm, vif, ba_enable);
 }