From 5ca402e612cf124e9c0cae684d5213d4c5db24b8 Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Mon, 7 Mar 2016 11:45:41 -0500 Subject: linux-yocto/4.4: iwlwifi: mvm: don't allow sched scans without matches to be started Integrating the following commit for improved iwlwifi support: 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 Signed-off-by: Emmanuel Grumbach Signed-off-by: Wu Zheng Signed-off-by: Bruce Ashfield Signed-off-by: Bruce Ashfield Signed-off-by: Richard Purdie --- meta/recipes-kernel/linux/linux-yocto-rt_4.4.bb | 2 +- meta/recipes-kernel/linux/linux-yocto-tiny_4.4.bb | 2 +- meta/recipes-kernel/linux/linux-yocto_4.4.bb | 16 ++++++++-------- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_4.4.bb b/meta/recipes-kernel/linux/linux-yocto-rt_4.4.bb index 41619d7296..d24c119973 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_4.4.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_4.4.bb @@ -2,7 +2,7 @@ KBRANCH ?= "standard/preempt-rt" require recipes-kernel/linux/linux-yocto.inc -SRCREV_machine ?= "853991833cc5140ca25450e81bf6b822d537a6ac" +SRCREV_machine ?= "19e3ed348aefd0802dc8747cc143bea1155edc12" SRCREV_meta ?= "da47accec6c17c22cecf064be1da29b5bf3d7583" SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.4.git;branch=${KBRANCH};name=machine \ diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_4.4.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_4.4.bb index 5a0884a487..c31f637155 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_4.4.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_4.4.bb @@ -9,7 +9,7 @@ LINUX_VERSION ?= "4.4.3" KMETA = "kernel-meta" KCONF_BSP_AUDIT_LEVEL = "2" -SRCREV_machine ?= "ff4c4ef15b51f45b9106d71bf1f62fe7c02e63c2" +SRCREV_machine ?= "dadb4369046246d7788db1f3cdf0a34298e35b4b" SRCREV_meta ?= "da47accec6c17c22cecf064be1da29b5bf3d7583" PV = "${LINUX_VERSION}+git${SRCPV}" diff --git a/meta/recipes-kernel/linux/linux-yocto_4.4.bb b/meta/recipes-kernel/linux/linux-yocto_4.4.bb index 9c3fe7f1de..ba39bb48db 100644 --- a/meta/recipes-kernel/linux/linux-yocto_4.4.bb +++ b/meta/recipes-kernel/linux/linux-yocto_4.4.bb @@ -11,14 +11,14 @@ KBRANCH_qemux86 ?= "standard/base" KBRANCH_qemux86-64 ?= "standard/base" KBRANCH_qemumips64 ?= "standard/mti-malta64" -SRCREV_machine_qemuarm ?= "fa6a2f888d8adfe03b24ef32654be470960aed41" -SRCREV_machine_qemuarm64 ?= "ff4c4ef15b51f45b9106d71bf1f62fe7c02e63c2" -SRCREV_machine_qemumips ?= "a23b6eb1c5bca3bde2a9f94d9059274fff7da281" -SRCREV_machine_qemuppc ?= "ff4c4ef15b51f45b9106d71bf1f62fe7c02e63c2" -SRCREV_machine_qemux86 ?= "ff4c4ef15b51f45b9106d71bf1f62fe7c02e63c2" -SRCREV_machine_qemux86-64 ?= "ff4c4ef15b51f45b9106d71bf1f62fe7c02e63c2" -SRCREV_machine_qemumips64 ?= "8bbcb369cf605d1ada384f4b950da2abc5d1f4cc" -SRCREV_machine ?= "ff4c4ef15b51f45b9106d71bf1f62fe7c02e63c2" +SRCREV_machine_qemuarm ?= "d3ce63d0c83f579605b308f83c62a49e5dbf73e6" +SRCREV_machine_qemuarm64 ?= "dadb4369046246d7788db1f3cdf0a34298e35b4b" +SRCREV_machine_qemumips ?= "06c34af69f436c8dca8ff23a30a7d1f834e1d07c" +SRCREV_machine_qemuppc ?= "dadb4369046246d7788db1f3cdf0a34298e35b4b" +SRCREV_machine_qemux86 ?= "dadb4369046246d7788db1f3cdf0a34298e35b4b" +SRCREV_machine_qemux86-64 ?= "dadb4369046246d7788db1f3cdf0a34298e35b4b" +SRCREV_machine_qemumips64 ?= "79b496614c5d0b4862796928ef9890f2eb375a3b" +SRCREV_machine ?= "dadb4369046246d7788db1f3cdf0a34298e35b4b" SRCREV_meta ?= "da47accec6c17c22cecf064be1da29b5bf3d7583" SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.4.git;name=machine;branch=${KBRANCH}; \ -- cgit 1.2.3-korg