Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 79221126 authored by Sara Sharon's avatar Sara Sharon Committed by Luca Coelho
Browse files

iwlwifi: mvm: implement CSA abort 



In case we receive abort operation for CSA, clean up
our state.

Signed-off-by: default avatarSara Sharon <sara.sharon@intel.com>
Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
parent 9cfcf71c

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

+24 −0
Original line number Diff line number Diff line
@@ -4631,6 +4631,29 @@ static int iwl_mvm_post_channel_switch(struct ieee80211_hw *hw, 
	return ret;

}



static void iwl_mvm_abort_channel_switch(struct ieee80211_hw *hw,

					 struct ieee80211_vif *vif)

{

	struct iwl_mvm *mvm = IWL_MAC80211_GET_MVM(hw);

	struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);

	struct iwl_chan_switch_te_cmd cmd = {

		.mac_id = cpu_to_le32(FW_CMD_ID_AND_COLOR(mvmvif->id,

							  mvmvif->color)),

		.action = cpu_to_le32(FW_CTXT_ACTION_REMOVE),

	};



	IWL_DEBUG_MAC80211(mvm, "Abort CSA on mac %d\n", mvmvif->id);



	mutex_lock(&mvm->mutex);

	WARN_ON(iwl_mvm_send_cmd_pdu(mvm,

				     WIDE_ID(MAC_CONF_GROUP,

					     CHANNEL_SWITCH_TIME_EVENT_CMD),

				     0, sizeof(cmd), &cmd));

	mutex_unlock(&mvm->mutex);



	WARN_ON(iwl_mvm_post_channel_switch(hw, vif));

}



static void iwl_mvm_flush_no_vif(struct iwl_mvm *mvm, u32 queues, bool drop)

{

	int i;
@@ -5087,6 +5110,7 @@ const struct ieee80211_ops iwl_mvm_hw_ops = { 
	.channel_switch = iwl_mvm_channel_switch,

	.pre_channel_switch = iwl_mvm_pre_channel_switch,

	.post_channel_switch = iwl_mvm_post_channel_switch,

	.abort_channel_switch = iwl_mvm_abort_channel_switch,



	.tdls_channel_switch = iwl_mvm_tdls_channel_switch,

	.tdls_cancel_channel_switch = iwl_mvm_tdls_cancel_channel_switch,