Skip to content

Commit

Permalink
iwlwifi: mvm: don't allow sched scans without matches to be started
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Luca Coelho authored and Emmanuel Grumbach committed Feb 15, 2016
1 parent 0ad4ece commit 5e56276
Showing 1 changed file with 4 additions and 0 deletions.
4 changes: 4 additions & 0 deletions drivers/net/wireless/intel/iwlwifi/mvm/scan.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 5e56276

Please sign in to comment.