openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Emmanuel Grumbach 2014-01-26 16:54:05 +02:00
parent d623d24a77
commit dcefeec05b
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/net/wireless/iwlwifi/mvm/power.c
View File

@ -423,6 +423,7 @@ static int iwl_mvm_power_mac_update_mode(struct iwl_mvm *mvm,
int ret; int ret;
bool ba_enable; bool ba_enable;
struct iwl_mac_power_cmd cmd = {}; struct iwl_mac_power_cmd cmd = {};
struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);
if (vif->type != NL80211_IFTYPE_STATION) if (vif->type != NL80211_IFTYPE_STATION)
return 0; return 0;
@ -439,8 +440,9 @@ static int iwl_mvm_power_mac_update_mode(struct iwl_mvm *mvm,
if (ret) if (ret)
return ret; return ret;
ba_enable = !!(cmd.flags & ba_enable = !(iwlmvm_mod_params.power_scheme == IWL_POWER_SCHEME_CAM ||
cpu_to_le16(POWER_FLAGS_POWER_MANAGEMENT_ENA_MSK)); 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); return iwl_mvm_update_beacon_abort(mvm, vif, ba_enable);
} }