Hi John, Here follows some more patches for 3.17. These are mostly fixes to what we've sent to you before for next merge window. Please pull! Thanks. Gustavo --- The following changes since commit 4d042654afb342386cb5c33e29843b76d598ab61: Bluetooth: cmtp: Remove unnecessary null test (2014-07-14 23:00:13 +0200) 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 c2aef6e8cbebd60f79555baeb9266e220f135a44: Bluetooth: Add support for Broadcom device of Asus Z97-DELUXE motherboard (2014-07-21 15:07:08 +0300) ---------------------------------------------------------------- Amitkumar Karwar (2): Bluetooth: add public address configuration for Marvell USB devices Bluetooth: btmrvl: add public address configuration support Chin-Ran Lo (1): Bluetooth: btmrvl: avoid sending data to firmware after hs_activated Johan Hedberg (18): Bluetooth: Remove unnecessary params variable from process_adv_report() Bluetooth: Don't try to reject failed LE connections Bluetooth: Add proper defines for HCI connection role Bluetooth: Convert HCI_CONN_MASTER flag to a conn->role variable Bluetooth: Use explicit role instead of a bool in function parameters Bluetooth: Add a role parameter to hci_conn_add() Bluetooth: Track number of LE slave connections Bluetooth: Fix trying to initiate connections when acting as LE slave Bluetooth: Fix always checking the blacklist for incoming connections Bluetooth: Fix using uninitialized variable when pairing Bluetooth: Don't bother user space without IO capabilities Bluetooth: Fix resetting remote authentication requirement after pairing Bluetooth: Pass initiator/acceptor information to hci_conn_security() Bluetooth: Introduce a flag to track who really initiates authentication Bluetooth: Fix allowing initiating pairing when not pairable Bluetooth: Use EOPNOTSUPP instead of ENOTSUPP Bluetooth: Disable HCI_CONNECTABLE based passive scanning for now Bluetooth: Prefer sizeof(*ptr) when allocating memory Marcel Holtmann (3): Bluetooth: Fix endian and alignment issue with ath3k version handling Bluetooth: Remove unneeded variable assignment in hmac_sha256 Bluetooth: Add support for Broadcom device of Asus Z97-DELUXE motherboard Vladimir Davydov (1): Bluetooth: never linger on process exit drivers/bluetooth/ath3k.c | 29 +++++++++------- drivers/bluetooth/btmrvl_drv.h | 1 + drivers/bluetooth/btmrvl_main.c | 24 +++++++++++++ drivers/bluetooth/btmrvl_sdio.c | 16 ++++----- drivers/bluetooth/btusb.c | 34 ++++++++++++++++++ include/net/bluetooth/hci.h | 6 ++-- include/net/bluetooth/hci_core.h | 20 +++++++---- include/net/bluetooth/l2cap.h | 2 +- net/bluetooth/amp.c | 6 ++-- net/bluetooth/hci_conn.c | 41 ++++++++++++---------- net/bluetooth/hci_core.c | 28 ++++++++------- net/bluetooth/hci_event.c | 110 ++++++++++++++++++++++++++++++---------------------------- net/bluetooth/l2cap_core.c | 32 +++++++++-------- net/bluetooth/l2cap_sock.c | 7 ++-- net/bluetooth/mgmt.c | 6 ++-- net/bluetooth/rfcomm/core.c | 3 +- net/bluetooth/rfcomm/sock.c | 3 +- net/bluetooth/sco.c | 6 ++-- net/bluetooth/smp.c | 24 +++++++------ 19 files changed, 245 insertions(+), 153 deletions(-)
Attachment:
pgprjqea5msLt.pgp
Description: PGP signature