Hi John, One more pull request to 3.15. This is mostly and bug fix pull request, it contains several fixes and clean up all over the tree, plus some small new features. Please pull or let me know of any problem. Thanks. Gustavo --- The following changes since commit 81ad6fd9698f659dbabdc6cd3e1667a98eb2be3b: Bluetooth: Remove unnecessary stop_scan_complete function (2014-02-28 10:28:17 -0800) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git for-upstream for you to fetch changes up to 40b552aa5a0bfa785bc7ddb5c2d7965b1e0bb08d: Bluetooth: Enforce strict Secure Connections Only mode security (2014-03-19 23:30:32 +0200) ---------------------------------------------------------------- Alexander Aring (1): Bluetooth: make bluetooth 6lowpan as an option Andre Guedes (1): Bluetooth: Enable duplicates filter in background scan Andrew Earl (1): Bluetooth: Fix aborting eSCO connection in case of error 0x20 Arnd Bergmann (1): Bluetooth: make sure 6LOWPAN_IPHC is built-in if needed Claudio Takahasi (1): Bluetooth: Fix removing Long Term Key Gustavo Padovan (1): Bluetooth: Fix skb allocation check for A2MP Joe Perches (1): Bluetooth: Convert uses of __constant_<foo> to <foo> Johan Hedberg (9): Bluetooth: Fix expected key count debug logs Bluetooth: Fix updating SMP remote key distribution information Bluetooth: Fix const declaration for swap function src parameter Bluetooth: Fix smp_e byte order to be consistent with SMP specification Bluetooth: Fix MITM flag when initiating SMP pairing Bluetooth: Simplify logic when checking SMP_FLAG_TK_VALID Bluetooth: Increase SMP re-encryption delay to 500ms Bluetooth: Fix SMP user passkey notification mgmt event Bluetooth: Fix Pair Device response parameters for pairing failure Marcel Holtmann (3): Bluetooth: Add support for handling signature resolving keys Bluetooth: Make LTK and CSRK only persisent when bonding Bluetooth: Enforce strict Secure Connections Only mode security Michael Knudsen (1): Bluetooth: Stop BCSP/H5 timer before cleaning up Peng Chen (2): Bluetooth: Add a new PID/VID 0cf3/e005 for AR3012. Bluetooth: Fix endianess issue in the ath3k driver Valentin Ilie (1): Bluetooth: Remove assignments in if-statements drivers/bluetooth/ath3k.c | 13 ++-- drivers/bluetooth/bfusb.c | 14 ++-- drivers/bluetooth/bluecard_cs.c | 9 ++- drivers/bluetooth/bt3c_cs.c | 7 +- drivers/bluetooth/btuart_cs.c | 6 +- drivers/bluetooth/btusb.c | 1 + drivers/bluetooth/dtl1_cs.c | 9 ++- drivers/bluetooth/hci_bcsp.c | 31 ++++---- drivers/bluetooth/hci_h5.c | 10 +-- drivers/bluetooth/hci_ldisc.c | 9 ++- include/net/bluetooth/hci_core.h | 11 ++- include/net/bluetooth/mgmt.h | 12 ++++ net/bluetooth/6lowpan.h | 21 ++++++ net/bluetooth/Kconfig | 8 ++- net/bluetooth/Makefile | 3 +- net/bluetooth/a2mp.c | 12 +++- net/bluetooth/hci_conn.c | 37 ++++++---- net/bluetooth/hci_core.c | 14 ++-- net/bluetooth/hci_event.c | 27 +++++-- net/bluetooth/hci_sock.c | 16 ++--- net/bluetooth/l2cap_core.c | 90 +++++++++++------------ net/bluetooth/l2cap_sock.c | 6 +- net/bluetooth/mgmt.c | 83 +++++++++++++++------ net/bluetooth/rfcomm/core.c | 4 +- net/bluetooth/sco.c | 10 +-- net/bluetooth/smp.c | 208 +++++++++++++++++++++++++++++++++++------------------ net/bluetooth/smp.h | 4 +- 27 files changed, 451 insertions(+), 224 deletions(-)
Attachment:
pgpDw7r1TiBwR.pgp
Description: PGP signature