pull request: bluetooth-next 2014-07-31

[Johan Hedberg]

Hi John,

Here's one more (hopefully last) pull request for 3.17.

We've got:

- 6lowpan fixes/cleanups
- A couple crash fixes, one for the Marvell HCI driver and another in LE SMP.
- Fix for an incorrect connected state check
- Fix for the bondable requirement during pairing (an issue which had
  crept in because of using "pairable" when in fact the actual meaning
  was "bondable" (these have different meanings in Bluetooth)

Let me know if there are any issues. Thanks.

Johan

---
The following changes since commit 568ba389be505f505b7fbeedb9ab4ece27603fc9:

  brcmfmac: Fix OOB interrupt not working for BCM43362 (2014-07-29 10:32:57 -0400)

are available in the git repository at:

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

for you to fetch changes up to 8500d791c458ccbbb3e2d3fa9a0320ffd5729069:

  Bluetooth: Fix crash in the Marvell driver initialization codepath (2014-07-31 01:07:28 +0200)

----------------------------------------------------------------
Alexander Aring (7):
      6lowpan: iphc: rename hc06_ptr pointer to hc_ptr
      6lowpan: iphc: use sizeof in udp uncompression
      6lowpan: iphc: cleanup use of lowpan_fetch_skb
      6lowpan: iphc: cleanup use of lowpan_push_hc_data
      6lowpan: iphc: use ipv6 api to check address scope
      6lowpan: iphc: remove check on null
      6lowpan: remove unused LOWPAN_FRAG_SIZE define

Anatol Pomozov (1):
      Bluetooth: Fix crash in the Marvell driver initialization codepath

Johan Hedberg (5):
      Bluetooth: Fix SMP context tracking leading to a kernel crash
      Bluetooth: Fix check for connected state when pairing
      Bluetooth: Rename HCI_PAIRABLE to HCI_BONDABLE
      Bluetooth: Rename pairable mgmt setting to bondable
      Bluetooth: Always use non-bonding requirement when not bondable

Marcel Holtmann (6):
      6lowpan: iphc: Fix block comments to match networking style
      6lowpan: iphc: Fix issues with alignment matching open parenthesis
      6lowpan: iphc: Fix missing blank line after variable declarations
      6lowpan: iphc: Fix missing braces for if statement
      6lowpan: iphc: Fix parenthesis alignments which off-by-one
      Bluetooth: Fix sparse warning from HID new leds handling

Varka Bhadram (2):
      6lowpan: remove unused macros
      6lowpan: remove unused function

 drivers/bluetooth/btmrvl_main.c |   5 +
 include/net/6lowpan.h           |  50 ------
 include/net/bluetooth/hci.h     |   2 +-
 include/net/bluetooth/mgmt.h    |   4 +-
 net/6lowpan/iphc.c              | 295 +++++++++++++++++-------------------
 net/bluetooth/hci_core.c        |   4 +-
 net/bluetooth/hci_event.c       |  15 +-
 net/bluetooth/hidp/core.c       |   2 +-
 net/bluetooth/mgmt.c            |  24 +--
 net/bluetooth/smp.c             |  17 ++-
 10 files changed, 185 insertions(+), 233 deletions(-)

Attachment: pgpe2Kp7gozFd.pgp
Description: PGP signature