summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@windriver.com>2016-02-29 17:10:27 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-03-02 22:39:44 +0000
commit6ed16ff8650ec43750368566313f49a4b2c60cd8 (patch)
treeba618c6746490f18cda3775cb65aa20a63db81ad /meta
parent2497e809d8cd7dac31ff5290d789754b040b6d58 (diff)
downloadpoky-6ed16ff8650ec43750368566313f49a4b2c60cd8.tar.gz
linux-yocto/4.1: iwlwifi: mvm: don't allow sched scans without matches to be started
Integrating the following commit: 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.coelho@intel.com> Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com> Signed-off-by: Wu Zheng <wu.zheng@intel.com> (From OE-Core rev: ecbf5fddb9a6c1b37b1742328d99960301229a25) Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-kernel/linux/linux-yocto-rt_4.1.bb2
-rw-r--r--meta/recipes-kernel/linux/linux-yocto-tiny_4.1.bb2
-rw-r--r--meta/recipes-kernel/linux/linux-yocto_4.1.bb16
3 files changed, 10 insertions, 10 deletions
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_4.1.bb b/meta/recipes-kernel/linux/linux-yocto-rt_4.1.bb
index 33fbb45272..4a6928a7d1 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_4.1.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_4.1.bb
@@ -2,7 +2,7 @@ KBRANCH ?= "standard/preempt-rt/base"
2 2
3require recipes-kernel/linux/linux-yocto.inc 3require recipes-kernel/linux/linux-yocto.inc
4 4
5SRCREV_machine ?= "73c76150065091f6cc1751a3c8ec2d8a8cf8b6af" 5SRCREV_machine ?= "2a4c22b03d434f7695e607b6ad30f77671985a6d"
6SRCREV_meta ?= "56dcb623ebf5e83d65fdb4eb270f23676bb000a5" 6SRCREV_meta ?= "56dcb623ebf5e83d65fdb4eb270f23676bb000a5"
7 7
8SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.1.git;branch=${KBRANCH};name=machine \ 8SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.1.git;branch=${KBRANCH};name=machine \
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_4.1.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_4.1.bb
index c802df797f..41a79f17b7 100644
--- a/meta/recipes-kernel/linux/linux-yocto-tiny_4.1.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-tiny_4.1.bb
@@ -9,7 +9,7 @@ LINUX_VERSION ?= "4.1.18"
9KMETA = "kernel-meta" 9KMETA = "kernel-meta"
10KCONF_BSP_AUDIT_LEVEL = "2" 10KCONF_BSP_AUDIT_LEVEL = "2"
11 11
12SRCREV_machine ?= "dd6492b44151164242718855d6c9eebbf0018eac" 12SRCREV_machine ?= "ec18b0b3bd6befd416078e81d775dab37b3f9124"
13SRCREV_meta ?= "56dcb623ebf5e83d65fdb4eb270f23676bb000a5" 13SRCREV_meta ?= "56dcb623ebf5e83d65fdb4eb270f23676bb000a5"
14 14
15PV = "${LINUX_VERSION}+git${SRCPV}" 15PV = "${LINUX_VERSION}+git${SRCPV}"
diff --git a/meta/recipes-kernel/linux/linux-yocto_4.1.bb b/meta/recipes-kernel/linux/linux-yocto_4.1.bb
index 82cfb74223..9663966d8e 100644
--- a/meta/recipes-kernel/linux/linux-yocto_4.1.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_4.1.bb
@@ -11,14 +11,14 @@ KBRANCH_qemux86 ?= "standard/base"
11KBRANCH_qemux86-64 ?= "standard/base" 11KBRANCH_qemux86-64 ?= "standard/base"
12KBRANCH_qemumips64 ?= "standard/mti-malta64" 12KBRANCH_qemumips64 ?= "standard/mti-malta64"
13 13
14SRCREV_machine_qemuarm ?= "2af5b3dff27887af8ffbc700a6a09a9d75c2b05f" 14SRCREV_machine_qemuarm ?= "96b21aab2adf2c9396f8cf579420a2e497923eae"
15SRCREV_machine_qemuarm64 ?= "dd6492b44151164242718855d6c9eebbf0018eac" 15SRCREV_machine_qemuarm64 ?= "ec18b0b3bd6befd416078e81d775dab37b3f9124"
16SRCREV_machine_qemumips ?= "deab449b07a79b9a108f1c94e3dabef34135517a" 16SRCREV_machine_qemumips ?= "e0a6ffb62a4d28659e0e1be7b1a42a8ef499aa3b"
17SRCREV_machine_qemuppc ?= "dd6492b44151164242718855d6c9eebbf0018eac" 17SRCREV_machine_qemuppc ?= "ec18b0b3bd6befd416078e81d775dab37b3f9124"
18SRCREV_machine_qemux86 ?= "dd6492b44151164242718855d6c9eebbf0018eac" 18SRCREV_machine_qemux86 ?= "ec18b0b3bd6befd416078e81d775dab37b3f9124"
19SRCREV_machine_qemux86-64 ?= "dd6492b44151164242718855d6c9eebbf0018eac" 19SRCREV_machine_qemux86-64 ?= "ec18b0b3bd6befd416078e81d775dab37b3f9124"
20SRCREV_machine_qemumips64 ?= "4984422b4cd3deb6d68f46d010fb8eb007468677" 20SRCREV_machine_qemumips64 ?= "1b1349ca5a642086d4b92347fb9d1de1c6eab742"
21SRCREV_machine ?= "dd6492b44151164242718855d6c9eebbf0018eac" 21SRCREV_machine ?= "ec18b0b3bd6befd416078e81d775dab37b3f9124"
22SRCREV_meta ?= "56dcb623ebf5e83d65fdb4eb270f23676bb000a5" 22SRCREV_meta ?= "56dcb623ebf5e83d65fdb4eb270f23676bb000a5"
23 23
24SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.1.git;name=machine;branch=${KBRANCH}; \ 24SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.1.git;name=machine;branch=${KBRANCH}; \