aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLuciano Coelho <luciano.coelho@intel.com>2014-05-14 03:01:14 -0400
committerEmmanuel Grumbach <emmanuel.grumbach@intel.com>2014-05-19 09:37:30 -0400
commit3b0077226733fac0eba4abaa65636901522bc6bf (patch)
tree138fb8d60637000a1fd425d4d3f67c6c39f6b27a
parentaf7c603eb476216f1c27d82b802f0ce879c54ab3 (diff)
iwlwifi: mvm: update power after phy_ctxt is NULL when unassigning chanctx
iwl_mvm_power_update_mac() (more specifically iwl_mvm_power_iterator()) relies on the phy_ctxt setting to decide whether the vif is active or not. When unassigning a chanctx, we should therefore call iwl_mvm_power_update_mac() after setting phy_chanctx to NULL. Signed-off-by: Luciano Coelho <luciano.coelho@intel.com> Reviewed-by: Johannes Berg <johannes.berg@intel.com> Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
-rw-r--r--drivers/net/wireless/iwlwifi/mvm/mac80211.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlwifi/mvm/mac80211.c b/drivers/net/wireless/iwlwifi/mvm/mac80211.c
index 22a445f23aa1..1c932e906be4 100644
--- a/drivers/net/wireless/iwlwifi/mvm/mac80211.c
+++ b/drivers/net/wireless/iwlwifi/mvm/mac80211.c
@@ -2299,10 +2299,10 @@ static void iwl_mvm_unassign_vif_chanctx(struct ieee80211_hw *hw,
2299 } 2299 }
2300 2300
2301 iwl_mvm_binding_remove_vif(mvm, vif); 2301 iwl_mvm_binding_remove_vif(mvm, vif);
2302 iwl_mvm_power_update_mac(mvm, vif);
2303 2302
2304out_unlock: 2303out_unlock:
2305 mvmvif->phy_ctxt = NULL; 2304 mvmvif->phy_ctxt = NULL;
2305 iwl_mvm_power_update_mac(mvm, vif);
2306 mutex_unlock(&mvm->mutex); 2306 mutex_unlock(&mvm->mutex);
2307} 2307}
2308 2308