Hi John, These are the changes I queued for 3.7. There are a many small fixes/improvements by Andre Guedes. A l2cap channel refcounting refactor by Jaganath. Bluetooth sockets now appears in /proc/net, by Masatake Yamato and Sachin Kamat changes ours drivers to use devm_kzalloc(). Please pull, or let me know any concerns you have. Thanks. Gustavo --- The following changes since commit 173f8654746c138a08f51a8a0db7747763a896a2: Merge tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4 (2012-07-27 20:52:25 -0700) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next master for you to fetch changes up to cd17decbd9af41c9548bb108ccf156519f8253ec: Bluetooth: Refactor in hci_le_conn_complete_evt (2012-08-06 15:08:41 -0300) ---------------------------------------------------------------- Andre Guedes (17): Bluetooth: Remove missing code Bluetooth: Use lmp_bredr_capable where applicable Bluetooth: Use lmp_le_capable where applicable Bluetooth: Use lmp_ssp_capable where applicable Bluetooth: Use lmp_esco_capable where applicable Bluetooth: Use lmp_rswitch_capable where applicable Bluetooth: Use lmp_sniff_capable where applicable Bluetooth: Use lmp_sniffsubr_capable where applicable Bluetooth: Use lmp_no_flush_capable where applicable Bluetooth: Remove locking in hci_user_passkey_request_evt Bluetooth: Trivial refactoring Bluetooth: Fix hci_le_conn_complete_evt Bluetooth: Remove unneeded code Bluetooth: Refactor hci_cs_le_create_conn Bluetooth: Find hci_conn by BT_CONNECT state Bluetooth: Lookup hci_conn in hci_le_conn_complete_evt Bluetooth: Refactor in hci_le_conn_complete_evt Bluetooth: Do not shadow hdr variable Bluetooth: Fix processing A2MP chan in security_cfm Bluetooth: Make connect / disconnect cfm functions return void Jaganath Kanakkassery (2): Bluetooth: Move l2cap_chan_hold/put to l2cap_core.c Bluetooth: Free the l2cap channel list only when refcount is zero Masatake YAMATO (8): Bluetooth: /proc/net/ entries for bluetooth protocols Bluetooth: Added /proc/net/bnep via bt_procfs_init() Bluetooth: Added /proc/net/cmtp via bt_procfs_init() Bluetooth: Added /proc/net/hci via bt_procfs_init() Bluetooth: Added /proc/net/hidp via bt_procfs_init() Bluetooth: Added /proc/net/l2cap via bt_procfs_init() Bluetooth: Added /proc/net/rfcomm via bt_procfs_init() Bluetooth: Added /proc/net/sco via bt_procfs_init() Sachin Kamat (11): Bluetooth: Use devm_kzalloc in bcm203x.c file. Bluetooth: Use devm_kzalloc in bfusb.c file Bluetooth: Use devm_kzalloc in bluecard_cs.c file Bluetooth: Use devm_kzalloc in bpa10x.c file Bluetooth: Use devm_kzalloc in bt3c_cs.c file Bluetooth: Use devm_kzalloc in btmrvl_sdio.c file Bluetooth: Use devm_kzalloc in btsdio.c file Bluetooth: Use devm_kzalloc in btuart_cs.c file Bluetooth: Use devm_kzalloc in btusb.c file Bluetooth: Use devm_kzalloc in btwilink.c file Bluetooth: Use devm_kzalloc in dtl1_cs.c file drivers/bluetooth/bcm203x.c | 8 +-- drivers/bluetooth/bfusb.c | 12 ++-- drivers/bluetooth/bluecard_cs.c | 5 +- drivers/bluetooth/bpa10x.c | 8 +-- drivers/bluetooth/bt3c_cs.c | 5 +- drivers/bluetooth/btmrvl_sdio.c | 15 ++--- drivers/bluetooth/btsdio.c | 8 +-- drivers/bluetooth/btuart_cs.c | 5 +- drivers/bluetooth/btusb.c | 13 +--- drivers/bluetooth/btwilink.c | 8 +-- drivers/bluetooth/dtl1_cs.c | 3 +- include/net/bluetooth/bluetooth.h | 10 +++ include/net/bluetooth/hci.h | 11 ++++ include/net/bluetooth/hci_core.h | 22 ++----- include/net/bluetooth/l2cap.h | 17 +---- include/net/bluetooth/smp.h | 8 +-- net/bluetooth/a2mp.c | 16 +++-- net/bluetooth/af_bluetooth.c | 141 ++++++++++++++++++++++++++++++++++++++++ net/bluetooth/bnep/sock.c | 22 ++++++- net/bluetooth/cmtp/sock.c | 23 ++++++- net/bluetooth/hci_core.c | 6 +- net/bluetooth/hci_event.c | 93 +++++++++++--------------- net/bluetooth/hci_sock.c | 13 +++- net/bluetooth/hidp/sock.c | 22 ++++++- net/bluetooth/l2cap_core.c | 32 +++++++-- net/bluetooth/l2cap_sock.c | 22 ++++++- net/bluetooth/mgmt.c | 34 +++++++--- net/bluetooth/rfcomm/sock.c | 14 +++- net/bluetooth/sco.c | 16 +++-- 29 files changed, 415 insertions(+), 197 deletions(-)
Attachment:
pgpD1eUlbrCRi.pgp
Description: PGP signature