From: Luciano Coelho <luciano.coelho@intel.com>
Date: Wed, 14 May 2014 07:01:14 +0000 (+0300)
Subject: iwlwifi: mvm: update power after phy_ctxt is NULL when unassigning chanctx
X-Git-Tag: v5.15~17769^2~122^2^2~16^2~11
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=3b0077226733fac0eba4abaa65636901522bc6bf;p=mirror_ubuntu-kernels.git

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>
---

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,
 	}
 
 	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);
 }