summaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwlwifi/mvm/mac80211.c
diff options
context:
space:
mode:
authorLuciano Coelho <luciano.coelho@intel.com>2014-05-14 10:01:14 +0300
committerEmmanuel Grumbach <emmanuel.grumbach@intel.com>2014-05-19 16:37:30 +0300
commit3b0077226733fac0eba4abaa65636901522bc6bf (patch)
tree138fb8d60637000a1fd425d4d3f67c6c39f6b27a /drivers/net/wireless/iwlwifi/mvm/mac80211.c
parentaf7c603eb476216f1c27d82b802f0ce879c54ab3 (diff)
downloadop-kernel-dev-3b0077226733fac0eba4abaa65636901522bc6bf.zip
op-kernel-dev-3b0077226733fac0eba4abaa65636901522bc6bf.tar.gz
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>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/mvm/mac80211.c')
-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 22a445f..1c932e9 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,
}
iwl_mvm_binding_remove_vif(mvm, vif);
- iwl_mvm_power_update_mac(mvm, vif);
out_unlock:
mvmvif->phy_ctxt = NULL;
+ iwl_mvm_power_update_mac(mvm, vif);
mutex_unlock(&mvm->mutex);
}
OpenPOWER on IntegriCloud