03c71748f1
A smaller than usual merge, but with a couple of important fixes: - Fix UART TX stall condition (easily reproducible on Arduino 101) - Add missing BT_SECURITY_NONE security level - Fix missing ATT responses due to missing buffers - Consolidate ATT buffers into a smaller set of pools (2 instead of 4) - Fix missing error response for LE Connection oriented Channels ---------------------------------------------------------------- Carles Cufi (1): Bluetooth: uart: Fix UART TX stall condition Johan Hedberg (6): Bluetooth: samples/hci-uart: Remove unneeded hci_driver.h include Bluetooth: Move hci_driver.h to include/drivers/bluetooth Bluetooth: Add handling for security level 0 Bluetooth: samples/hci-uart: Fix up configuration files Bluetooth: samples/hci-uart: Fix minor style issues Bluetooth: Rename BT_SECURITY_ZERO to BT_SECURITY_NONE Luiz Augusto von Dentz (5): Bluetooth: ATT: Fix not responding when there is a request in parallel Bluetooth: ATT: Rework buffer pools to minimize extra data Bluetooth: GATT: Fix calling read handler twice Bluetooth: L2CAP: Add security check for LE CoC Bluetooth: shell: Add support for setting security level to l2cap_register drivers/bluetooth/hci/h4.c | 3 +- drivers/bluetooth/hci/h5.c | 3 +- include/bluetooth/att.h | 11 +- include/bluetooth/conn.h | 2 + include/bluetooth/l2cap.h | 3 + .../bluetooth/hci_driver.h | 0 net/bluetooth/Kconfig | 6 +- net/bluetooth/att.c | 72 +++++----- net/bluetooth/gatt.c | 9 ++ net/bluetooth/l2cap.c | 23 ++- net/bluetooth/l2cap_br.c | 24 +++- .../bluetooth/hci-uart/Makefile | 2 +- .../{prj.conf => generic.conf} | 4 - .../hci-uart/src/main.c | 18 +-- tests/bluetooth/shell/src/main.c | 9 +- .../src/bluetooth.c | 2 +- 16 files changed, 119 insertions(+), 72 deletions(-) rename include/{ => drivers}/bluetooth/hci_driver.h (100%) rename samples/bluetooth/hci-uart/{prj.conf => generic.conf} (62%) Change-Id: Idc225b46206d4d3f0a85918e5cf9e527fb407a1e Signed-off-by: Johan Hedberg <johan.hedberg@intel.com> |
||
---|---|---|
.known-issues | ||
arch | ||
boards | ||
doc | ||
drivers | ||
ext | ||
include | ||
kernel | ||
lib | ||
misc | ||
net | ||
samples | ||
scripts | ||
subsys | ||
tests | ||
.checkpatch.conf | ||
.gitattributes | ||
.gitignore | ||
.gitreview | ||
.mailmap | ||
defaults.tc | ||
Kbuild | ||
Kconfig | ||
Kconfig.zephyr | ||
LICENSE | ||
MAINTAINERS | ||
Makefile | ||
Makefile.inc | ||
zephyr-env.sh |