3.18-stable patches

added patches:
	iwlwifi-mvm-add-a-flag-to-enable-match-found-notification.patch

diff --git a/queue-3.18/iwlwifi-mvm-add-a-flag-to-enable-match-found-notification.patch b/queue-3.18/iwlwifi-mvm-add-a-flag-to-enable-match-found-notification.patch
new file mode 100644 (file)
index 0000000..fcf785d
--- /dev/null
+++ b/queue-3.18/iwlwifi-mvm-add-a-flag-to-enable-match-found-notification.patch
@@ -0,0 +1,50 @@
+From 7e2a38831db4cf082aa8b4997f3cbfe8cb03b669 Mon Sep 17 00:00:00 2001
+From: David Spinadel <david.spinadel@intel.com>
+Date: Tue, 23 Dec 2014 14:38:09 +0200
+Subject: iwlwifi: mvm: add a flag to enable match found notification
+
+From: David Spinadel <david.spinadel@intel.com>
+
+commit 7e2a38831db4cf082aa8b4997f3cbfe8cb03b669 upstream.
+
+Add a flag that enables match found notification to align with
+FW API change.
+
+Signed-off-by: David Spinadel <david.spinadel@intel.com>
+Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+
+---
+ drivers/net/wireless/iwlwifi/mvm/fw-api-scan.h |    2 ++
+ drivers/net/wireless/iwlwifi/mvm/scan.c        |    1 +
+ 2 files changed, 3 insertions(+)
+
+--- a/drivers/net/wireless/iwlwifi/mvm/fw-api-scan.h
++++ b/drivers/net/wireless/iwlwifi/mvm/fw-api-scan.h
+@@ -672,6 +672,7 @@ struct iwl_scan_channel_opt {
+  * @IWL_MVM_LMAC_SCAN_FLAG_FRAGMENTED: all passive scans will be fragmented
+  * @IWL_MVM_LMAC_SCAN_FLAGS_RRM_ENABLED: insert WFA vendor-specific TPC report
+  *    and DS parameter set IEs into probe requests.
++ * @IWL_MVM_LMAC_SCAN_FLAG_MATCH: Send match found notification on matches
+  */
+ enum iwl_mvm_lmac_scan_flags {
+       IWL_MVM_LMAC_SCAN_FLAG_PASS_ALL         = BIT(0),
+@@ -681,6 +682,7 @@ enum iwl_mvm_lmac_scan_flags {
+       IWL_MVM_LMAC_SCAN_FLAG_MULTIPLE_SSIDS   = BIT(4),
+       IWL_MVM_LMAC_SCAN_FLAG_FRAGMENTED       = BIT(5),
+       IWL_MVM_LMAC_SCAN_FLAGS_RRM_ENABLED     = BIT(6),
++      IWL_MVM_LMAC_SCAN_FLAG_MATCH            = BIT(9),
+ };
+ 
+ enum iwl_scan_priority {
+--- a/drivers/net/wireless/iwlwifi/mvm/scan.c
++++ b/drivers/net/wireless/iwlwifi/mvm/scan.c
+@@ -1334,6 +1334,7 @@ int iwl_mvm_unified_sched_scan_lmac(stru
+               IWL_DEBUG_SCAN(mvm,
+                              "Sending scheduled scan with filtering, n_match_sets %d\n",
+                              req->n_match_sets);
++              flags |= IWL_MVM_LMAC_SCAN_FLAG_MATCH;
+       } else {
+               IWL_DEBUG_SCAN(mvm,
+                              "Sending Scheduled scan without filtering\n");

diff --git a/queue-3.18/series b/queue-3.18/series
index c908c8ea311514cfeaa327d9381e2a4f4516c466..2b0dfe37b82b07773460ca34506d5105ea3ccf1f 100644 (file)
--- a/queue-3.18/series
+++ b/queue-3.18/series
@@ -54,3 +54,4 @@ netfilter-nfnetlink-relax-strict-multicast-group-check-from-netlink_bind.patch
 netfilter-conntrack-fix-race-between-confirmation-and-flush.patch
 ipvs-uninitialized-data-with-ip_vs_ipv6.patch
 revert-swiotlb-xen-pass-dev_addr-to-swiotlb_tbl_unmap_single.patch
+iwlwifi-mvm-add-a-flag-to-enable-match-found-notification.patch