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

Commit 72a33568 authored by Luca Coelho's avatar Luca Coelho Committed by Emmanuel Grumbach
Browse files

iwlwifi: mvm: ignore LMAC scan notifications when running UMAC scans 



If the firmware sends LMAC scan notifications while a UMAC scan is
running, just WARN and ignore it, otherwise the scanning state gets
messed up.

Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
Signed-off-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
parent e7c2e1fd

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

+7 −0
Original line number Diff line number Diff line
@@ -333,6 +333,13 @@ void iwl_mvm_rx_lmac_scan_complete_notif(struct iwl_mvm *mvm, 
	struct iwl_periodic_scan_complete *scan_notif = (void *)pkt->data;

	bool aborted = (scan_notif->status == IWL_SCAN_OFFLOAD_ABORTED);



	/* If this happens, the firmware has mistakenly sent an LMAC

	 * notification during UMAC scans -- warn and ignore it.

	 */

	if (WARN_ON_ONCE(fw_has_capa(&mvm->fw->ucode_capa,

				     IWL_UCODE_TLV_CAPA_UMAC_SCAN)))

		return;



	/* scan status must be locked for proper checking */

	lockdep_assert_held(&mvm->mutex);