summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Spinadel <david.spinadel@intel.com>2014-11-10 11:16:53 +0200
committerEmmanuel Grumbach <emmanuel.grumbach@intel.com>2014-11-24 08:30:13 +0200
commit2992a324e35e49f3ea950938c91b6b2108bbbf4c (patch)
tree14e71b1b759f0b0d8a71357a72b3fcffb98723b0
parentc8660dd5e910a8c66c13ef99efd3c0ee88845ba5 (diff)
downloadop-kernel-dev-2992a324e35e49f3ea950938c91b6b2108bbbf4c.zip
op-kernel-dev-2992a324e35e49f3ea950938c91b6b2108bbbf4c.tar.gz
iwlwifi: mvm: remove warning on unknown scan complete
Remove warning on scan complete with unknown ID, since this scan could be already cleared in abort flow. Signed-off-by: David Spinadel <david.spinadel@intel.com> Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
-rw-r--r--drivers/net/wireless/iwlwifi/mvm/scan.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/net/wireless/iwlwifi/mvm/scan.c b/drivers/net/wireless/iwlwifi/mvm/scan.c
index b6719b6..e5294d0 100644
--- a/drivers/net/wireless/iwlwifi/mvm/scan.c
+++ b/drivers/net/wireless/iwlwifi/mvm/scan.c
@@ -1951,8 +1951,10 @@ int iwl_mvm_rx_umac_scan_complete_notif(struct iwl_mvm *mvm,
bool sched = !!(uid & IWL_UMAC_SCAN_UID_SCHED_SCAN);
int uid_idx = iwl_mvm_find_scan_uid(mvm, uid);
- if (WARN(uid_idx >= IWL_MVM_MAX_SIMULTANEOUS_SCANS,
- "Scan notification for uknown scan ID\n"))
+ /*
+ * Scan uid may be set to zero in case of scan abort request from above.
+ */
+ if (uid_idx >= IWL_MVM_MAX_SIMULTANEOUS_SCANS)
return 0;
IWL_DEBUG_SCAN(mvm,
OpenPOWER on IntegriCloud