Hi John, A few fixes for 3.16. This pull request contains a NULL dereference fix, and some security/pairing fixes. Please pull. Thanks! Gustavo --- The following changes since commit 616a8394b5df8c88f4dd416f4527439a4e365034: rt2x00: fix rfkill regression on rt2500pci (2014-06-17 14:11:16 -0400) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth.git for-upstream for you to fetch changes up to 48439d501e3d9e8634bdc0c418e066870039599d: Bluetooth: Ignore H5 non-link packets in non-active state (2014-06-23 18:22:48 +0200) ---------------------------------------------------------------- Johan Hedberg (3): Bluetooth: Fix overriding higher security level in SMP Bluetooth: Refactor authentication method lookup into its own function Bluetooth: Fix rejecting pairing in case of insufficient capabilities Loic Poulain (1): Bluetooth: Ignore H5 non-link packets in non-active state Lukasz Rymanowski (1): Bluetooth: Fix for ACL disconnect when pairing fails Marcel Holtmann (1): Revert "Bluetooth: Add a new PID/VID 0cf3/e005 for AR3012." drivers/bluetooth/ath3k.c | 2 -- drivers/bluetooth/btusb.c | 1 - drivers/bluetooth/hci_h5.c | 1 + net/bluetooth/hci_conn.c | 12 ++++++++++- net/bluetooth/smp.c | 60 ++++++++++++++++++++++++++++++++++++++++------------- 5 files changed, 58 insertions(+), 18 deletions(-)
Attachment:
pgpaK9xyLsCJH.pgp
Description: PGP signature