pull request: bluetooth-next 2014-09-14

From: Johan Hedberg
Date: Sun Sep 14 2014 - 00:19:46 EST


Hi John,

Here are some more patches intended for 3.18. Most of them are cleanups
or fixes for SMP. The only exception is a fix for BR/EDR L2CAP fixed
channels which should now work better together with the L2CAP
information request procedure.

Let me know if there are any issues pulling. Thanks.

Johan

---
The following changes since commit 39e90c77637b3892a39f2908aea57539e961c50e:

Bluetooth: 6lowpan: Route packets that are not meant to peer via correct device (2014-09-09 15:51:47 +0200)

are available in the git repository at:

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

for you to fetch changes up to 9a783a139c32a905825ee0aa9597f485ea461f76:

Bluetooth: Fix re-setting RPA as expired when deferring update (2014-09-12 18:34:25 +0200)

----------------------------------------------------------------
Johan Hedberg (10):
Bluetooth: Fix allowing SMP Signing info PDU
Bluetooth: Remove unnecessary early initialization of variable
Bluetooth: Fix ignoring unknown SMP authentication requirement bits
Bluetooth: Centralize disallowing SMP commands to a single place
Bluetooth: Fix SMP security level when we have no IO capabilities
Bluetooth: Add smp_ltk_sec_level() helper function
Bluetooth: Fix L2CAP information request handling for fixed channels
Bluetooth: Avoid hard-coded IO capability values in SMP
Bluetooth: Expire RPA if encryption fails
Bluetooth: Fix re-setting RPA as expired when deferring update

net/bluetooth/hci_core.c | 1 +
net/bluetooth/hci_event.c | 11 +++++---
net/bluetooth/l2cap_core.c | 53 ++++++++++++++++++++++++---------------
net/bluetooth/smp.c | 57 +++++++++++++++++++-----------------------
net/bluetooth/smp.h | 8 ++++++
5 files changed, 75 insertions(+), 55 deletions(-)

Attachment: pgpCygSbl8M6R.pgp
Description: PGP signature