Pull request: bluetooth-2.6 2009-04-28

Pull request: bluetooth-2.6 2009-04-28

[Marcel Holtmann]

Hi Dave,

these are three additional patches that should go into the 2.6.30 kernel
release. The first one fixes a NULL pointer dereference when adding and
removing sysfs devices for ACL connections. The other two are fixes for
interoperability regression we introduced when adding full Simple
Pairing support. A big thank you here goes to the Nokia guys and their
QA team for testing the crap out of this. There is actually nothing
simple about Simple Pairing :)

Regards

Marcel


Please pull from

    git://git.kernel.org/pub/scm/linux/kernel/git/holtmann/bluetooth-2.6.git master

This will update the following files:

 include/net/bluetooth/hci.h      |    1 +
 include/net/bluetooth/hci_core.h |    8 +++++---
 net/bluetooth/hci_conn.c         |   10 ++++------
 net/bluetooth/hci_event.c        |   36 +++++++++++++++++++++++++++++++++++-
 net/bluetooth/hci_sysfs.c        |   37 ++++++++++++++++---------------------
 5 files changed, 61 insertions(+), 31 deletions(-)

through these ChangeSets:

Marcel Holtmann (2):
    Bluetooth: Add different pairing timeout for Legacy Pairing
    Bluetooth: Fix connection establishment with low security requirement

Roger Quadros (1):
    Bluetooth: Ensure that HCI sysfs add/del is preempt safe

Re: Pull request: bluetooth-2.6 2009-04-28

[David Miller]

From: Marcel Holtmann <marcel@holtmann.org>
Date: Tue, 28 Apr 2009 09:58:36 -0700

> these are three additional patches that should go into the 2.6.30 kernel
> release. The first one fixes a NULL pointer dereference when adding and
> removing sysfs devices for ACL connections. The other two are fixes for
> interoperability regression we introduced when adding full Simple
> Pairing support. A big thank you here goes to the Nokia guys and their
> QA team for testing the crap out of this. There is actually nothing
> simple about Simple Pairing :)

Pulled, thanks.