pull request: bluetooth-next 2012-12-03

[Gustavo Padovan]

Hi John,

A few more patches to 3.8, I hope they can still make it to mainline!
The most important ones are the socket option for the SCO protocol to allow
accept/refuse new connections from userspace. Other than that I added some
fixes and Andrei did more AMP work.

Please pull, or let me know any concerns you have. Thanks!

	Gustavo

---
The following changes since commit 2b2fec4d08a0aabe20d2e749cb7978f04217af65:

  Bluetooth: Remove OOB data if device was discovered in band (2012-11-20 16:03:15 -0200)

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 0b27a4b97cb1874503c78453c0903df53c0c86b2:

  Revert "Bluetooth: Fix possible deadlock in SCO code" (2012-12-03 16:00:04 -0200)

----------------------------------------------------------------
Andrei Emeltchenko (6):
      Bluetooth: Refactor l2cap_send_disconn_req
      Bluetooth: AMP: Mark controller radio powered down after HCIDEVDOWN
      Bluetooth: AMP: Check that AMP is present and active
      Bluetooth: Fix missing L2CAP EWS Conf parameter
      Bluetooth: Process receiving FCS_NONE in L2CAP Conf Rsp
      Bluetooth: trivial: Change NO_FCS_RECV to RECV_NO_FCS

Frédéric Dalleau (2):
      Bluetooth: Add BT_DEFER_SETUP option to sco socket
      Bluetooth: Implement deferred sco socket setup

Gustavo Padovan (4):
      Bluetooth: Add missing lock nesting notation
      Bluetooth: cancel power_on work when unregistering the device
      Bluetooth: Move double negation to macros
      Revert "Bluetooth: Fix possible deadlock in SCO code"

 include/net/bluetooth/hci_core.h |  31 ++++++++++---
 include/net/bluetooth/l2cap.h    |   2 +-
 net/bluetooth/hci_core.c         |   5 +++
 net/bluetooth/hci_event.c        |  56 ++++++++++++++++++++---
 net/bluetooth/l2cap_core.c       | 100 +++++++++++++++++++++--------------------
 net/bluetooth/mgmt.c             |  10 ++---
 net/bluetooth/rfcomm/sock.c      |   4 +-
 net/bluetooth/sco.c              |  86 ++++++++++++++++++++++++++++++-----
 8 files changed, 213 insertions(+), 81 deletions(-)

Attachment: pgp00000.pgp
Description: PGP signature