Hi John, Here goes some patches for the -next release. There is nothing really special for this pull request, just a bunch of refactors, fixes and clean ups. Please pull, or let me know of any problems! Thanks. Gustavo --- The following changes since commit e8b1ab9e6d30394e0df3e4f60bf56c4dc9bf0863: Bluetooth: Fix returning peer address in pending connect state (2014-03-26 09:31:33 -0700) 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 22e70786413ed05950207eda7be420c280b776d7: Bluetooth: Remove hci_h4 unused defines (2014-04-24 11:55:26 -0300) ---------------------------------------------------------------- Andre Guedes (1): Bluetooth: Use memdup_user in le_auto_conn_write() Bing Zhao (2): Bluetooth: btmrvl: separate write-to-clear function from interrupt handler Bluetooth: btmrvl: implement read-to-clear for SD8897 interrupts Johan Hedberg (15): Bluetooth: Refactor advertising report processing into its own function Bluetooth: Move local identity address setting to a central place Bluetooth: Fix LE responder/initiator address setting Bluetooth: Add error mapping for Directed Advertising Timeout Bluetooth: Don't send device found events during passive scanning Bluetooth: Add scan_rsp parameter to mgmt_device_found() Bluetooth: Add directed advertising support through connect() Bluetooth: Merge ADV_IND/ADV_SCAN_IND and SCAN_RSP together Bluetooth: Remove redundant NULL check Bluetooth: Fix line splitting of mgmt_device_found parameters Bluetooth: Don't send device found events for duplicate reports Bluetooth: Store also RSSI for pending advertising reports Bluetooth: Fix RSSI value in device found event from disabling scan Bluetooth: Remove unnecessary NULL check in hci_inquiry_cache_update Bluetooth: Fix address in unmergeable device found events Lukasz Rymanowski (3): Bluetooth: Keep msec in DISCOV_INTERLEAVED_TIMEOUT Bluetooth: Add new debugfs parameter Bluetooth: Keep msec in DISCOV_LE_TIMEOUT Marcel Holtmann (1): Bluetooth: Return EOPNOTSUPP for HCISETRAW ioctl command Mikel Astiz (3): Bluetooth: Refactor hci_get_auth_req() Bluetooth: Refactor code for outgoing dedicated bonding Bluetooth: Request MITM Protection when initiator Petri Gynther (1): Bluetooth: btmrvl: Fix btmrvl_send_module_cfg_cmd() Poulain, Loic (1): Bluetooth: Remove hci_h4 unused defines Timo Mueller (1): Bluetooth: Use MITM Protection when IO caps allow it drivers/bluetooth/btmrvl_drv.h | 4 +- drivers/bluetooth/btmrvl_main.c | 19 +++- drivers/bluetooth/btmrvl_sdio.c | 103 ++++++++++++++++---- drivers/bluetooth/btmrvl_sdio.h | 3 + drivers/bluetooth/hci_h4.c | 7 -- include/net/bluetooth/hci.h | 1 + include/net/bluetooth/hci_core.h | 13 ++- net/bluetooth/hci_conn.c | 81 ++++++++++++++-- net/bluetooth/hci_core.c | 20 ++-- net/bluetooth/hci_event.c | 246 +++++++++++++++++++++++++++++++++++------------ net/bluetooth/hci_sock.c | 11 +-- net/bluetooth/lib.c | 1 + net/bluetooth/mgmt.c | 36 ++++--- 13 files changed, 407 insertions(+), 138 deletions(-)
Attachment:
pgpP5G18QXGvL.pgp
Description: PGP signature