diff mbox series

[for,v5.11,01/12] iwlwifi: mvm: skip power command when unbinding vif during CSA

Message ID iwlwifi.20210115130252.64a2254ac5c3.Iaa3a9050bf3d7c9cd5beaf561e932e6defc12ec3@changeid (mailing list archive)
State Accepted
Commit bf544e9aa570034e094a8a40d5f9e1e2c4916d18
Delegated to: Kalle Valo
Headers show
Series iwlwifi: fixes intended for v5.10 2020-12-02 | expand

Commit Message

Luca Coelho Jan. 15, 2021, 11:05 a.m. UTC 
From: Sara Sharon <sara.sharon@intel.com>

In the new CSA flow, we remain associated during CSA, but
still do a unbind-bind to the vif. However, sending the power
command right after when vif is unbound but still associated
causes FW to assert (0x3400) since it cannot tell the LMAC id.

Just skip this command, we will send it again in a bit, when
assigning the new context.

Signed-off-by: Sara Sharon <sara.sharon@intel.com>
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
---
 drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c | 3 +++
 1 file changed, 3 insertions(+)

Comments

Kalle Valo Jan. 25, 2021, 1:54 p.m. UTC | #1 
Luca Coelho <luca@coelho.fi> wrote:

> From: Sara Sharon <sara.sharon@intel.com>
> 
> In the new CSA flow, we remain associated during CSA, but
> still do a unbind-bind to the vif. However, sending the power
> command right after when vif is unbound but still associated
> causes FW to assert (0x3400) since it cannot tell the LMAC id.
> 
> Just skip this command, we will send it again in a bit, when
> assigning the new context.
> 
> Signed-off-by: Sara Sharon <sara.sharon@intel.com>
> Signed-off-by: Luca Coelho <luciano.coelho@intel.com>

12 patches applied to wireless-drivers.git, thanks.

bf544e9aa570 iwlwifi: mvm: skip power command when unbinding vif during CSA
5c56d862c749 iwlwifi: mvm: take mutex for calling iwl_mvm_get_sync_time()
34b9434cd0d4 iwlwifi: pcie: avoid potential PNVM leaks
1c58bed4b7f7 iwlwifi: pnvm: don't skip everything when not reloading
82a08d0cd7b5 iwlwifi: pnvm: don't try to load after failures
a800f95858d0 iwlwifi: fix the NMI flow for old devices
0f8d5656b3fd iwlwifi: queue: don't crash if txq->entries is NULL
ed0022da8bd9 iwlwifi: pcie: set LTR on more devices
98c7d21f957b iwlwifi: pcie: add a NULL check in iwl_pcie_txq_unmap
2d6bc752cc28 iwlwifi: pcie: fix context info memory leak
6701317476bb iwlwifi: pcie: use jiffies for memory read spin time limit
3d372c4edfd4 iwlwifi: pcie: reschedule in long-running memory reads
diff mbox series

Patch

diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c b/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c
index da32937ba9a7..43ff0407916a 100644
--- a/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c
@@ -4194,6 +4194,9 @@  static void __iwl_mvm_unassign_vif_chanctx(struct iwl_mvm *mvm,
 	iwl_mvm_binding_remove_vif(mvm, vif);
 
 out:
+	if (fw_has_capa(&mvm->fw->ucode_capa, IWL_UCODE_TLV_CAPA_CHANNEL_SWITCH_CMD) &&
+	    switching_chanctx)
+		return;
 	mvmvif->phy_ctxt = NULL;
 	iwl_mvm_power_update_mac(mvm);
 }