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: Luca Coelho <luciano.coelho@intel.com>
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>

diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/scan.c b/drivers/net/wireless/intel/iwlwifi/mvm/scan.c
index 6b9b1904551c90f245c214cde3857515efab2adc..e8a79bff9c1bb167143395b9b15e9f762f775707 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/mvm/scan.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/scan.c
@@ -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);