Find a file
Johan Hedberg 03c71748f1 Merge bluetooth branch to master
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>
2016-11-01 21:41:59 +02:00
.known-issues known-issues: update rule for TCF summary line 2016-09-16 11:31:27 -07:00
arch build: consolidate some common parts of linker scripts 2016-10-31 18:00:58 -07:00
boards boards: x86: Don't default to 'y' with NRF51_PM and WAIT_NOP 2016-11-01 19:37:26 +00:00
doc unified/doc: Update system threads section of Kernel Primer 2016-10-31 23:56:30 +00:00
drivers Bluetooth: uart: Fix UART TX stall condition 2016-11-01 21:40:39 +02:00
ext ext qmsi: Update to QMSI 1.3 release 2016-10-31 13:26:06 +00:00
include Bluetooth: Rename BT_SECURITY_ZERO to BT_SECURITY_NONE 2016-11-01 21:40:39 +02:00
kernel unified: Update kernel.h doxygen comments 2016-10-31 23:56:04 +00:00
lib iot/zoap: Add support for block sized transfers 2016-10-25 12:56:51 +00:00
misc drivers/uart: Refactor UART input hook. 2016-10-25 11:31:08 +00:00
net Bluetooth: L2CAP: Add security check for LE CoC 2016-11-01 21:40:39 +02:00
samples Bluetooth: samples/hci-uart: Fix minor style issues 2016-11-01 21:40:39 +02:00
scripts scripts: Update fixdep from kernel.org 2016-10-31 20:58:57 +00:00
subsys usb: move usb subsystem to subsys/usb and cleanup header inclusion 2016-10-31 19:21:42 +00:00
tests Bluetooth: shell: Add support for setting security level to l2cap_register 2016-11-01 21:40:39 +02:00
.checkpatch.conf checkpatch: do not check for min_t/max_t 2016-09-13 17:12:55 -04:00
.gitattributes First commit 2015-04-10 16:44:37 -07:00
.gitignore testcases: instruct git to ignore *log and outdir-* 2016-06-14 22:01:34 +00:00
.gitreview Add a .gitreview file 2016-02-20 14:25:01 +00:00
.mailmap mailmap: update with new emails 2016-10-07 16:15:24 +00:00
defaults.tc testcases: catch 'Fatal essential task error" messages 2016-10-31 12:57:28 +00:00
Kbuild unified/build: adapt Kbuild for unified kernel 2016-09-13 17:12:55 -04:00
Kconfig kconfig: Do not put architecture in the title 2016-03-14 16:50:51 -04:00
Kconfig.zephyr usb: move usb subsystem to subsys/usb and cleanup header inclusion 2016-10-31 19:21:42 +00:00
LICENSE add top level Apache 2.0 license file 2016-02-05 20:24:37 -05:00
MAINTAINERS usb: move usb subsystem to subsys/usb and cleanup header inclusion 2016-10-31 19:21:42 +00:00
Makefile usb: move usb subsystem to subsys/usb and cleanup header inclusion 2016-10-31 19:21:42 +00:00
Makefile.inc board: organize boards based on architecture 2016-10-24 19:59:42 +00:00
zephyr-env.sh win-build: corrects scripts_path for windows build. 2016-10-15 15:09:54 +00:00