Merge branch 'for-upstream' of...
Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next Johan Hedberg says: ==================== Here's another set of Bluetooth & ieee802154 patches intended for 4.1: - Added support for QCA ROME chipset family in the btusb driver - at86rf230 driver fixes & cleanups - ieee802154 cleanups - Refactoring of Bluetooth mgmt API to allow new users - New setting for static Bluetooth address exposed to user space - Refactoring of hci_dev flags to remove limit of 32 - Remove unnecessary fast-connectable setting usage restrictions - Fix behavior to be consistent when trying to pair already paired device - Service discovery corner-case fixes Please let me know if there are any issues pulling. Thanks. ==================== Signed-off-by:David S. Miller <davem@davemloft.net>
Showing
- drivers/bluetooth/btusb.c 301 additions, 32 deletionsdrivers/bluetooth/btusb.c
- drivers/net/ieee802154/at86rf230.c 154 additions, 72 deletionsdrivers/net/ieee802154/at86rf230.c
- include/linux/ieee802154.h 2 additions, 0 deletionsinclude/linux/ieee802154.h
- include/net/bluetooth/bluetooth.h 3 additions, 0 deletionsinclude/net/bluetooth/bluetooth.h
- include/net/bluetooth/hci.h 7 additions, 15 deletionsinclude/net/bluetooth/hci.h
- include/net/bluetooth/hci_core.h 50 additions, 9 deletionsinclude/net/bluetooth/hci_core.h
- include/net/bluetooth/mgmt.h 2 additions, 0 deletionsinclude/net/bluetooth/mgmt.h
- net/bluetooth/af_bluetooth.c 9 additions, 0 deletionsnet/bluetooth/af_bluetooth.c
- net/bluetooth/hci_conn.c 9 additions, 9 deletionsnet/bluetooth/hci_conn.c
- net/bluetooth/hci_core.c 133 additions, 97 deletionsnet/bluetooth/hci_core.c
- net/bluetooth/hci_debugfs.c 5 additions, 5 deletionsnet/bluetooth/hci_debugfs.c
- net/bluetooth/hci_event.c 63 additions, 64 deletionsnet/bluetooth/hci_event.c
- net/bluetooth/hci_request.c 17 additions, 17 deletionsnet/bluetooth/hci_request.c
- net/bluetooth/hci_sock.c 85 additions, 23 deletionsnet/bluetooth/hci_sock.c
- net/bluetooth/l2cap_core.c 5 additions, 5 deletionsnet/bluetooth/l2cap_core.c
- net/bluetooth/mgmt.c 994 additions, 953 deletionsnet/bluetooth/mgmt.c
- net/bluetooth/sco.c 1 addition, 1 deletionnet/bluetooth/sco.c
- net/bluetooth/smp.c 31 additions, 31 deletionsnet/bluetooth/smp.c
- net/ieee802154/6lowpan/core.c 1 addition, 1 deletionnet/ieee802154/6lowpan/core.c
- net/ieee802154/core.c 4 additions, 1 deletionnet/ieee802154/core.c
Loading
Please register or sign in to comment