| Message ID | 20150409195850.GA23404@t440s.P-661HNU-F1 |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
From: Johan Hedberg <johan.hedberg@gmail.com> Date: Thu, 9 Apr 2015 22:58:50 +0300 > We've had enough new patches during the past week (especially from > Marcel) that it'd be good to still get these queued for 4.1. > > The majority of the changes are from Marcel with lots of cleanup & > refactoring patches for the HCI UART driver. Marcel also split out some > Broadcom & Intel vendor specific functionality into two new btintel & > btbcm modules. > > In addition to the HCI driver changes there's the completion of our > local OOB data interface for pairing, added support for requesting > remote LE features when connecting, as well as a couple of minor fixes > for mac802154. > > Please let me know if there are any issues pulling. Thanks. Pulled, thanks Johan. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Hi Dave, We've had enough new patches during the past week (especially from Marcel) that it'd be good to still get these queued for 4.1. The majority of the changes are from Marcel with lots of cleanup & refactoring patches for the HCI UART driver. Marcel also split out some Broadcom & Intel vendor specific functionality into two new btintel & btbcm modules. In addition to the HCI driver changes there's the completion of our local OOB data interface for pairing, added support for requesting remote LE features when connecting, as well as a couple of minor fixes for mac802154. Please let me know if there are any issues pulling. Thanks. Johan --- The following changes since commit 7abccdba25be45630eede85053496f1f48d36ec8: Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next (2015-04-07 11:47:52 -0400) 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 23310f6f3a8f30f4b6794e941763da4708f7471a: mac802154: fix transmission power datatype (2015-04-09 19:56:15 +0200) ---------------------------------------------------------------- Johan Hedberg (2): Bluetooth: Update SSP OOB data EIR definitions Bluetooth: Add local SSP OOB data to OOB ext data mgmt command Marcel Holtmann (34): Bluetooth: hci_uart: Add support for vendor detection flag Bluetooth: hci_uart: Add support Intel address configuration Bluetooth: hci_uart: Add support Broadcom address configuration Bluetooth: hci_uart: Remove unneeded cast of tty->disc_data Bluetooth: hci_uart: Fix indentation issues for multi-line functions Bluetooth: hci_uart: Remove unused h4->rx_skb field Bluetooth: hci_uart: Remove unused h4->rx_state and h4->rx_count field Bluetooth: Make data pointer of hci_recv_stream_fragment const Bluetooth: hci_uart: Use const data pointer for received data Bluetooth: hci_uart: Introduce h4_recv_buf helper function Bluetooth: hci_uart: Use h4_recv_buf helper for H:4 protocol Bluetooth: hci_uart: Use h4_recv_buf helper for Atheros AR300x Bluetooth: Remove hci_recv_stream_fragment function Bluetooth: hci_uart: Make struct hci_uart_proto always const Bluetooth: hci_uart: Add name information to hci_uart_proto struct Bluetooth: hci_uart: Remove the manual protocol init message Bluetooth: hci_uart: Update version number driver Bluetooth: btbcm: Introduce generic Broadcom Bluetooth support Bluetooth: btusb: Use generic functionality by Broadcom module Bluetooth: hci_uart: Use generic functionality from Broadcom module Bluetooth: btbcm: Add support for Broadcom controller setup Bluetooth: btusb: Add option for Broadcom protocol support Bluetooth: btusb: Move Broadcom quirk setting into support module Bluetooth: btusb: Update version number of the module Bluetooth: hci_uart: Move setup callback into different location Bluetooth: hci_uart: Add protocol support for Broadcom UART devices Bluetooth: btbcm: Add firmware table for UART based devices Bluetooth: hci_uart: Provide generic H:4 receive framework Bluetooth: btintel: Introduce generic Intel Bluetooth support Bluetooth: btusb: Use generic Intel support for address support Bluetooth: btusb: Move Intel command structs into its own header Bluetooth: hci_uart: Use generic Intel support for address setting Bluetooth: Read LE remote features during connection establishment Bluetooth: btusb: Use proper data structures for Intel vendor events Varka Bhadram (2): mac802154: fix typo for device mac802154: fix transmission power datatype drivers/bluetooth/Kconfig | 41 ++++ drivers/bluetooth/Makefile | 4 + drivers/bluetooth/btbcm.c | 387 +++++++++++++++++++++++++++++ drivers/bluetooth/btbcm.h | 54 +++++ drivers/bluetooth/btintel.c | 101 ++++++++ drivers/bluetooth/btintel.h | 89 +++++++ drivers/bluetooth/btusb.c | 469 ++++++------------------------------ drivers/bluetooth/hci_ath.c | 49 ++-- drivers/bluetooth/hci_bcm.c | 153 ++++++++++++ drivers/bluetooth/hci_bcsp.c | 18 +- drivers/bluetooth/hci_h4.c | 132 ++++++++-- drivers/bluetooth/hci_h5.c | 16 +- drivers/bluetooth/hci_intel.c | 31 +++ drivers/bluetooth/hci_ldisc.c | 86 +++++-- drivers/bluetooth/hci_ll.c | 16 +- drivers/bluetooth/hci_uart.h | 55 ++++- drivers/net/ieee802154/at86rf230.c | 2 +- include/net/bluetooth/hci.h | 19 +- include/net/bluetooth/hci_core.h | 3 - include/net/mac802154.h | 4 +- net/bluetooth/hci_core.c | 148 +----------- net/bluetooth/hci_event.c | 107 +++++++- net/bluetooth/mgmt.c | 154 +++++++++++- 23 files changed, 1481 insertions(+), 657 deletions(-) create mode 100644 drivers/bluetooth/btbcm.c create mode 100644 drivers/bluetooth/btbcm.h create mode 100644 drivers/bluetooth/btintel.c create mode 100644 drivers/bluetooth/btintel.h create mode 100644 drivers/bluetooth/hci_bcm.c create mode 100644 drivers/bluetooth/hci_intel.c