diff options
| author | Emmanuel Grumbach <emmanuel.grumbach@intel.com> | 2016-02-25 10:59:41 +0200 |
|---|---|---|
| committer | Emmanuel Grumbach <emmanuel.grumbach@intel.com> | 2016-02-27 21:59:52 +0200 |
| commit | 3cce9bb07b5d40a3f8a10a1148f10896a7a42f5a (patch) | |
| tree | 87acd4a0b68aa8326844685c252e90b7efe4d2f2 /drivers/net/wireless/intel/iwlwifi/mvm/scan.c | |
| parent | dd4d3161d0f229031914f403721ced8cb64d4d52 (diff) | |
| parent | 20aa99bbddae74bded68338f9ba200ccae02858b (diff) | |
| download | linux-3cce9bb07b5d40a3f8a10a1148f10896a7a42f5a.tar.bz2 | |
Merge tag 'iwlwifi-for-kalle-2016-02-15' into HEAD
These are a few fixes for the current cycle.
3 out of the 5 patches fix a bugzilla.
* fix a race that users reported when we try to load the firmware
and the hardware rfkill interrupt triggers at the same time.
* Luca fixes a very visible bug in scheduled scan: our firmware
doesn't support scheduled scan with no profile configured and
the supplicant sometimes requests such scheduled scans.
* build system fix
* firmware name update for 8265
* typo fix in return value
Diffstat (limited to 'drivers/net/wireless/intel/iwlwifi/mvm/scan.c')
| -rw-r--r-- | drivers/net/wireless/intel/iwlwifi/mvm/scan.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/scan.c b/drivers/net/wireless/intel/iwlwifi/mvm/scan.c index 1e1ab9daaec9..aa6d8074f63a 100644 --- a/drivers/net/wireless/intel/iwlwifi/mvm/scan.c +++ b/drivers/net/wireless/intel/iwlwifi/mvm/scan.c @@ -1301,6 +1301,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; |