Commit 77770189 authored by Miri Korenblit's avatar Miri Korenblit Committed by Johannes Berg
Browse files

wifi: iwlwifi: cancel session protection only if there is one 



mac80211 might (due to an unavoidable race) cancel a ROC that has already
expired. In that case the driver should not send the session protection
cmd to cancel the ROC.
When session protection is supported, the te_data::id field is reused
to save the configuration id. Check it before sending the cmd.

Signed-off-by: default avatarMiri Korenblit <miriam.rachel.korenblit@intel.com>
Link: https://msgid.link/20240205211151.30176bf869d9.Id811c20d3746b870cbe0c946bbfe1c0ab0a290cb@changeid


Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 35c1bbd9

drivers/net/wireless/intel/iwlwifi/mvm/time-event.c

+12 −4
Original line number Diff line number Diff line
@@ -1224,13 +1224,21 @@ void iwl_mvm_stop_roc(struct iwl_mvm *mvm, struct ieee80211_vif *vif) 
	if (fw_has_capa(&mvm->fw->ucode_capa,

			IWL_UCODE_TLV_CAPA_SESSION_PROT_CMD)) {

		mvmvif = iwl_mvm_vif_from_mac80211(vif);

		te_data = &mvmvif->time_event_data;



		if (vif->type == NL80211_IFTYPE_P2P_DEVICE) {

			if (te_data->id >= SESSION_PROTECT_CONF_MAX_ID) {

				IWL_DEBUG_TE(mvm,

					     "No remain on channel event\n");

				return;

			}



		if (vif->type == NL80211_IFTYPE_P2P_DEVICE)

			iwl_mvm_cancel_session_protection(mvm, vif,

							  mvmvif->time_event_data.id,

							  mvmvif->time_event_data.link_id);

		else

							  te_data->id,

							  te_data->link_id);

		} else {

			iwl_mvm_roc_station_remove(mvm, mvmvif);

		}

		goto cleanup_roc;

	}