On 2016-03-07 2:05 AM, Zheng, Wu wrote:
Hi Bruce Ashfield,

Our system platform will use linux-yocto-4.4.

Therefore, Sending the patch again, It is for linux-yocto-4.4.
Thanks.

I've merged the change to the 4.4 tree. SRCREV updates will follow
in a few days, but if you adjust SRCREVs yourself, you can use it
now.

Bruce


Best Regards
Zheng Wu

-----Original Message-----
From: Zheng, Wu
Sent: Monday, March 7, 2016 3:09 PM
To: linux-yocto@yoctoproject.org
Cc: Ashfield, Bruce (Wind River) <bruce.ashfi...@windriver.com>; Zheng, Wu
<wu.zh...@intel.com>; Coelho, Luciano <luciano.coe...@intel.com>;
Grumbach, Emmanuel <emmanuel.grumb...@intel.com>
Subject: [PATCH] iwlwifi: mvm: don't allow sched scans without matches to be
started

commit 5e56276e7555b34550d51459a801ff75eca8b907 upstream.

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

Signed-off-by: Luca Coelho <luciano.coe...@intel.com>
Signed-off-by: Emmanuel Grumbach <emmanuel.grumb...@intel.com>
Signed-off-by: Wu Zheng <wu.zh...@intel.com>
---
drivers/net/wireless/iwlwifi/mvm/scan.c | 4 ++++
1 file changed, 4 insertions(+)

diff --git a/drivers/net/wireless/iwlwifi/mvm/scan.c
b/drivers/net/wireless/iwlwifi/mvm/scan.c
index d6e0c1b..8215d74 100644
--- a/drivers/net/wireless/iwlwifi/mvm/scan.c
+++ b/drivers/net/wireless/iwlwifi/mvm/scan.c
@@ -1267,6 +1267,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;
--
2.1.4


--
_______________________________________________
linux-yocto mailing list
linux-yocto@yoctoproject.org
https://lists.yoctoproject.org/listinfo/linux-yocto

Reply via email to