diff mbox

[3/5] iwlwifi: mvm: don't allow sched scans without matches to be started

Message ID 1455537546-22157-3-git-send-email-emmanuel.grumbach@intel.com
State Accepted
Delegated to: Kalle Valo
Headers show

Commit Message

Emmanuel Grumbach Feb. 15, 2016, 11:59 a.m. UTC
From: Luca Coelho <luciano.coelho@intel.com>

The firmware can perform a scheduled scan with not matchsets passed,
but it can't send notification that results were found.  Since the
userspace then cannot know when we got new results and the firmware
wouldn't trigger a wake in case we are sleeping, it's better not to
allow scans without matchsets.

This fixes https://bugzilla.kernel.org/show_bug.cgi?id=110831

Cc: <stable@vger.kernel.org> [3.17+]
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
 drivers/net/wireless/intel/iwlwifi/mvm/scan.c | 4 ++++
 1 file changed, 4 insertions(+)
diff mbox


diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/scan.c b/drivers/net/wireless/intel/iwlwifi/mvm/scan.c
index 9a15642..ea1e177 100644
--- a/drivers/net/wireless/intel/iwlwifi/mvm/scan.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/scan.c
@@ -1298,6 +1298,10 @@  int iwl_mvm_sched_scan_start(struct iwl_mvm *mvm,
 		return -EBUSY;
+	/* we don't support "match all" in the firmware */
+	if (!req->n_match_sets)
+		return -EOPNOTSUPP;
 	ret = iwl_mvm_check_running_scans(mvm, type);
 	if (ret)
 		return ret;