From: Greg Kroah-Hartman Date: Tue, 27 Jan 2015 23:47:44 +0000 (-0800) Subject: 3.18-stable patches X-Git-Tag: v3.10.67~18 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a8b5e9ca6dc03262260967968465d934f7b4a849;p=thirdparty%2Fkernel%2Fstable-queue.git 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 index 00000000000..fcf785dff10 --- /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 +Date: Tue, 23 Dec 2014 14:38:09 +0200 +Subject: iwlwifi: mvm: add a flag to enable match found notification + +From: David Spinadel + +commit 7e2a38831db4cf082aa8b4997f3cbfe8cb03b669 upstream. + +Add a flag that enables match found notification to align with +FW API change. + +Signed-off-by: David Spinadel +Signed-off-by: Emmanuel Grumbach +Signed-off-by: Greg Kroah-Hartman + + +--- + 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 c908c8ea311..2b0dfe37b82 100644 --- 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