Hi John,
Here goes a set of patches to 3.11. The biggest work here is from Andre Guedes
on the move of the Discovery to use the new request framework. Other than that
Johan provided a bunch of fixes to the L2CAP code. The rest are just small
fixes and clean ups.
Please pull or let me know of any problem! Thanks.
Gustavo
---
The following changes since commit b887664d882ee4f6a67e0bf05e5f141d32fcc067:
mwifiex: channel switch handling for station (2013-06-19 15:28:43 -0400)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next for-upstream
for you to fetch changes up to b8f4e068004859eefac7b1ced59ddb67ca6d2d80:
Bluetooth: Improve comments on the HCI_Delete_Store_Link_Key issue (2013-06-23 03:05:47 +0100)
----------------------------------------------------------------
Andre Guedes (14):
Bluetooth: Make inquiry_cache_flush non-static
Bluetooth: Update start_discovery to use HCI request
Bluetooth: Remove start discovery handling from hci_event.c
Bluetooth: Make mgmt_start_discovery_failed static
Bluetooth: Move discovery macros to hci_core.h
Bluetooth: Use HCI request in interleaved discovery
Bluetooth: Update stop_discovery to use HCI request
Bluetooth: Remove stop discovery handling from hci_event.c
Bluetooth: Make mgmt_stop_discovery_failed static
Bluetooth: Refactor hci_cc_le_set_scan_enable
Bluetooth: Remove LE scan helpers
Bluetooth: Remove inquiry helpers
Bluetooth: Remove empty event handler
Bluetooth: Mgmt Device Found Event
Andrei Emeltchenko (2):
Bluetooth: Use HCI_MGMT instead of HCI_LINK_KEYS flag
Bluetooth: Remove unneeded flag
Chen Gang (1):
Bluetooth: hidp: using strlcpy instead of strncpy, also beautify code.
Gustavo Padovan (1):
Bluetooth: Improve comments on the HCI_Delete_Store_Link_Key issue
Johan Hedberg (12):
Bluetooth: Handle LE L2CAP signalling in its own function
Bluetooth: Rename L2CAP_CID_LE_DATA to L2CAP_CID_ATT
Bluetooth: Fix LE vs BR/EDR selection when connecting
Bluetooth: Fix EBUSY condition test in l2cap_chan_connect
Bluetooth: Fix hardcoding ATT CID in __l2cap_chan_add()
Bluetooth: Add clarifying comment to l2cap_conn_ready()
Bluetooth: Fix duplicate call to l2cap_chan_ready()
Bluetooth: Remove useless sk variable in l2cap_le_conn_ready
Bluetooth: Remove unnecessary L2CAP channel state check
Bluetooth: Simplify hci_conn_hold/drop logic for L2CAP
Bluetooth: Remove useless hci_conn disc_timeout setting
Bluetooth: Fix multiple LE socket handling
Shuah Khan (1):
Bluetooth: Add missing reset_resume dev_pm_ops
drivers/bluetooth/btusb.c | 1 +
include/net/bluetooth/hci.h | 1 -
include/net/bluetooth/hci_core.h | 29 ++----
include/net/bluetooth/l2cap.h | 2 +-
net/bluetooth/hci_core.c | 192 +++++++++++-----------------------
net/bluetooth/hci_event.c | 71 ++-----------
net/bluetooth/hidp/core.c | 14 +--
net/bluetooth/l2cap_core.c | 121 +++++++++++++++-------
net/bluetooth/l2cap_sock.c | 4 +-
net/bluetooth/mgmt.c | 229 ++++++++++++++++++++++++++++-------------
10 files changed, 321 insertions(+), 343 deletions(-)
On Sun, Jun 23, 2013 at 03:23:56AM +0100, Gustavo Padovan wrote:
> Hi John,
>
> Here goes a set of patches to 3.11. The biggest work here is from Andre Guedes
> on the move of the Discovery to use the new request framework. Other than that
> Johan provided a bunch of fixes to the L2CAP code. The rest are just small
> fixes and clean ups.
>
> Please pull or let me know of any problem! Thanks.
>
> Gustavo
>
> ---
> The following changes since commit b887664d882ee4f6a67e0bf05e5f141d32fcc067:
>
> mwifiex: channel switch handling for station (2013-06-19 15:28:43 -0400)
>
> are available in the git repository at:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next for-upstream
>
> for you to fetch changes up to b8f4e068004859eefac7b1ced59ddb67ca6d2d80:
>
> Bluetooth: Improve comments on the HCI_Delete_Store_Link_Key issue (2013-06-23 03:05:47 +0100)
Pulling now...
--
John W. Linville Someday the world will need a hero, and you
[email protected] might be all we have. Be ready.