diff options
author | Bruce Ashfield <bruce.ashfield@windriver.com> | 2015-11-24 12:01:30 -0500 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-12-01 21:32:13 +0000 |
commit | b7f610d3e98159c40169b518e117fc1776237100 (patch) | |
tree | 8d2832b078e9e8c0c4d1385eb178de6cf402d9be /meta/recipes-kernel | |
parent | d08e761b44f0f8110eaa0981358b13dca560be72 (diff) | |
download | poky-b7f610d3e98159c40169b518e117fc1776237100.tar.gz |
linux-yocto/4.1: Bluetooth:Fix the connection fail of 6lowpan over BT LE
Backporting the 4.4 fix for 6lowpan:
Author: Wu Zheng <wu.zheng@intel.com>
Date: Fri Nov 20 13:25:57 2015 +0800
Bluetooth:Fix the connection fail of 6lowpan over BT LE
When two devices with 6lowpan over BT LE connect each other,
6lowpan over BT LE channel is set up between the two devices.
However, the status of channel is not right.
It always is set to CONNECTED and the channel can't be created.
The status of channel need to be removed when connection is created.
(The patch's reference from
b0c09f94ff1660a1873549b788c998284ea5fb8a)
Signed-off-by: Wu Zheng <wu.zheng@intel.com>
(From OE-Core rev: 2b6a6cad90bfef3afd5a721ec985f71336914fa7)
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-kernel')
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto-rt_4.1.bb | 2 | ||||
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto-tiny_4.1.bb | 2 | ||||
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto_4.1.bb | 16 |
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 d4ac038dd3..e569d16581 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 | ||
3 | require recipes-kernel/linux/linux-yocto.inc | 3 | require recipes-kernel/linux/linux-yocto.inc |
4 | 4 | ||
5 | SRCREV_machine ?= "45780656ed0c04f0e70a089ff229a7b0a9af3414" | 5 | SRCREV_machine ?= "44fb75fd4731d1169725ac49a305e0913440974f" |
6 | SRCREV_meta ?= "30c4b4bd79c5d774de6dcf23d0deab554e31f3d4" | 6 | SRCREV_meta ?= "30c4b4bd79c5d774de6dcf23d0deab554e31f3d4" |
7 | 7 | ||
8 | SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.1.git;branch=${KBRANCH};name=machine \ | 8 | SRC_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 1d8086c960..fe04f51d15 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.13" | |||
9 | KMETA = "kernel-meta" | 9 | KMETA = "kernel-meta" |
10 | KCONF_BSP_AUDIT_LEVEL = "2" | 10 | KCONF_BSP_AUDIT_LEVEL = "2" |
11 | 11 | ||
12 | SRCREV_machine ?= "ec44c165aa1d30bde477196ee428d82530e55485" | 12 | SRCREV_machine ?= "c22dc676d6d560d0b2a316283a514d65d2a510e4" |
13 | SRCREV_meta ?= "30c4b4bd79c5d774de6dcf23d0deab554e31f3d4" | 13 | SRCREV_meta ?= "30c4b4bd79c5d774de6dcf23d0deab554e31f3d4" |
14 | 14 | ||
15 | PV = "${LINUX_VERSION}+git${SRCPV}" | 15 | PV = "${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 99c73ddcd8..9553f3d2a7 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" | |||
11 | KBRANCH_qemux86-64 ?= "standard/base" | 11 | KBRANCH_qemux86-64 ?= "standard/base" |
12 | KBRANCH_qemumips64 ?= "standard/mti-malta64" | 12 | KBRANCH_qemumips64 ?= "standard/mti-malta64" |
13 | 13 | ||
14 | SRCREV_machine_qemuarm ?= "5039adac938a19aa547f94551126a8421ce62745" | 14 | SRCREV_machine_qemuarm ?= "817a421e7c1be9c1136da5772f351e77513a1ed2" |
15 | SRCREV_machine_qemuarm64 ?= "ec44c165aa1d30bde477196ee428d82530e55485" | 15 | SRCREV_machine_qemuarm64 ?= "c22dc676d6d560d0b2a316283a514d65d2a510e4" |
16 | SRCREV_machine_qemumips ?= "203b315e50e32ce39f9831b0518ef18f16f61025" | 16 | SRCREV_machine_qemumips ?= "9f244d964a5910244fc82c261c48e1dc0862654b" |
17 | SRCREV_machine_qemuppc ?= "ec44c165aa1d30bde477196ee428d82530e55485" | 17 | SRCREV_machine_qemuppc ?= "c22dc676d6d560d0b2a316283a514d65d2a510e4" |
18 | SRCREV_machine_qemux86 ?= "ec44c165aa1d30bde477196ee428d82530e55485" | 18 | SRCREV_machine_qemux86 ?= "c22dc676d6d560d0b2a316283a514d65d2a510e4" |
19 | SRCREV_machine_qemux86-64 ?= "ec44c165aa1d30bde477196ee428d82530e55485" | 19 | SRCREV_machine_qemux86-64 ?= "c22dc676d6d560d0b2a316283a514d65d2a510e4" |
20 | SRCREV_machine_qemumips64 ?= "9223cd7daecddcbdb0818aaa6edfbd90060d1b84" | 20 | SRCREV_machine_qemumips64 ?= "7fdfaf2387d7896c1ead6a000616e01ce72f0764" |
21 | SRCREV_machine ?= "ec44c165aa1d30bde477196ee428d82530e55485" | 21 | SRCREV_machine ?= "c22dc676d6d560d0b2a316283a514d65d2a510e4" |
22 | SRCREV_meta ?= "30c4b4bd79c5d774de6dcf23d0deab554e31f3d4" | 22 | SRCREV_meta ?= "30c4b4bd79c5d774de6dcf23d0deab554e31f3d4" |
23 | 23 | ||
24 | SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.1.git;name=machine;branch=${KBRANCH}; \ | 24 | SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.1.git;name=machine;branch=${KBRANCH}; \ |