Commit 70162580 authored by Shaul Triebitz's avatar Shaul Triebitz Committed by Luca Coelho
Browse files

iwlwifi: mvm: csa: do not abort CSA before disconnect 



While disconnecting from the AP due to bad channel switch
params (e.g. too long Tx block), do not send the firmware
'CSA abort' before disconnecting. That causes canceling the
immediate quiet and can cause transmitting data before the
disconnection happens.

Signed-off-by: default avatarShaul Triebitz <shaul.triebitz@intel.com>
Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
Link: https://lore.kernel.org/r/iwlwifi.20210117164916.b9af359a675f.I996fc7eb3d94e9539f8b117017c428448c42c7ad@changeid


Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
parent 708a39aa

drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c

+1 −3
Original line number Diff line number Diff line
@@ -1367,15 +1367,13 @@ static void iwl_mvm_abort_channel_switch(struct ieee80211_hw *hw, 


static void iwl_mvm_channel_switch_disconnect_wk(struct work_struct *wk)

{

	struct iwl_mvm *mvm;

	struct iwl_mvm_vif *mvmvif;

	struct ieee80211_vif *vif;



	mvmvif = container_of(wk, struct iwl_mvm_vif, csa_work.work);

	vif = container_of((void *)mvmvif, struct ieee80211_vif, drv_priv);

	mvm = mvmvif->mvm;



	iwl_mvm_abort_channel_switch(mvm->hw, vif);

	/* Trigger disconnect (should clear the CSA state) */

	ieee80211_chswitch_done(vif, false);

}