diff options
author | Alexander Bondar <alexander.bondar@intel.com> | 2013-05-29 03:19:50 -0400 |
---|---|---|
committer | Johannes Berg <johannes.berg@intel.com> | 2013-06-04 07:16:11 -0400 |
commit | 4bf881f5d55c2bb704771287613c8807ef181b3c (patch) | |
tree | 1e72a4c55499319b96b62cd196d3ca8a49a7e69b /drivers/net/wireless/iwlwifi/mvm/power.c | |
parent | 86a91ec757338edbce51de5dabd7afb0366f485c (diff) |
iwlwifi: mvm: Change location of vif_count verification for PM
Currently vif_count verification for power management enablement appear
in different places. Move these verifications to one place in
iwl_mvm_update_power_mode().
Signed-off-by: Alexander Bondar <alexander.bondar@intel.com>
Reviewed-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/mvm/power.c')
-rw-r--r-- | drivers/net/wireless/iwlwifi/mvm/power.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/drivers/net/wireless/iwlwifi/mvm/power.c b/drivers/net/wireless/iwlwifi/mvm/power.c index 67cf24aa72f9..6cb98ce96ac4 100644 --- a/drivers/net/wireless/iwlwifi/mvm/power.c +++ b/drivers/net/wireless/iwlwifi/mvm/power.c | |||
@@ -246,6 +246,17 @@ int iwl_mvm_power_update_mode(struct iwl_mvm *mvm, struct ieee80211_vif *vif) | |||
246 | if (vif->type != NL80211_IFTYPE_STATION || vif->p2p) | 246 | if (vif->type != NL80211_IFTYPE_STATION || vif->p2p) |
247 | return 0; | 247 | return 0; |
248 | 248 | ||
249 | /* | ||
250 | * TODO: The following vif_count verification is temporary condition. | ||
251 | * Avoid power mode update if more than one interface is currently | ||
252 | * active. Remove this condition when FW will support power management | ||
253 | * on multiple MACs. | ||
254 | */ | ||
255 | IWL_DEBUG_POWER(mvm, "Currently %d interfaces active\n", | ||
256 | mvm->vif_count); | ||
257 | if (mvm->vif_count > 1) | ||
258 | return 0; | ||
259 | |||
249 | iwl_mvm_power_build_cmd(mvm, vif, &cmd); | 260 | iwl_mvm_power_build_cmd(mvm, vif, &cmd); |
250 | iwl_mvm_power_log(mvm, &cmd); | 261 | iwl_mvm_power_log(mvm, &cmd); |
251 | 262 | ||