diff options
| author | Luca Coelho <[email protected]> | 2015-11-06 08:57:11 +0000 |
|---|---|---|
| committer | Emmanuel Grumbach <[email protected]> | 2015-11-26 14:38:49 +0000 |
| commit | 72a3356885d13c4dd0b41034b931e3d5a0f807cc (patch) | |
| tree | a6472f1e3e4f3e261aeb658c274817c9558d27f0 /drivers/net/wireless/intel/iwlwifi/mvm/scan.c | |
| parent | iwlwifi: mvm: Enable MPLUT only on supported hw (diff) | |
| download | kernel-72a3356885d13c4dd0b41034b931e3d5a0f807cc.tar.gz kernel-72a3356885d13c4dd0b41034b931e3d5a0f807cc.zip | |
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 <[email protected]>
Signed-off-by: Emmanuel Grumbach <[email protected]>
Diffstat (limited to 'drivers/net/wireless/intel/iwlwifi/mvm/scan.c')
| -rw-r--r-- | drivers/net/wireless/intel/iwlwifi/mvm/scan.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/scan.c b/drivers/net/wireless/intel/iwlwifi/mvm/scan.c index 6b9b1904551c..e8a79bff9c1b 100644 --- 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); |