diff options
| author |   David S. Miller <davem@davemloft.net> | 2017-08-18 11:07:46 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-08-18 11:07:46 -0700 |
| commit | 633cefe390e59e9449dc88707235e57ac76b5c38 (patch) | |
| tree | 8abb1a28dd3b63dc228b9124ad81c5179c1a55f1 /net | |
| parent | ipv6: fix false-postive maybe-uninitialized warning (diff) | |
| parent | Bluetooth: hci_bcm: Handle empty packet after firmware loading (diff) | |
| download | linux-dev-633cefe390e59e9449dc88707235e57ac76b5c38.tar.xz linux-dev-633cefe390e59e9449dc88707235e57ac76b5c38.zip | |
Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next
Johan Hedberg says:
====================
pull request: bluetooth-next 2017-08-18
Here's one more bluetooth-next pull request for the 4.14 kernel:
- Multiple fixes for Broadcom controllers
- Fixes to the bluecard HCI driver
- New USB ID for Realtek RTL8723BE controller
- Fix static analyzer warning with kfree
Please let me know if there are any issues pulling. Thanks.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
| -rw-r--r-- | net/bluetooth/Kconfig | 12 | ||||
| -rw-r--r-- | net/bluetooth/selftest.c | 2 |
2 files changed, 13 insertions, 1 deletions
diff --git a/net/bluetooth/Kconfig b/net/bluetooth/Kconfig index 68f951b3e85a..db82a40875e8 100644 --- a/net/bluetooth/Kconfig +++ b/net/bluetooth/Kconfig @@ -45,6 +45,11 @@ config BT_BREDR bool "Bluetooth Classic (BR/EDR) features" depends on BT default y + help + Bluetooth Classic includes support for Basic Rate (BR) + available with Bluetooth version 1.0b or later and support + for Enhanced Data Rate (EDR) available with Bluetooth + version 2.0 or later. source "net/bluetooth/rfcomm/Kconfig" @@ -58,11 +63,18 @@ config BT_HS bool "Bluetooth High Speed (HS) features" depends on BT_BREDR default y + help + Bluetooth High Speed includes support for off-loading + Bluetooth connections via 802.11 (wifi) physical layer + available with Bluetooth version 3.0 or later. config BT_LE bool "Bluetooth Low Energy (LE) features" depends on BT default y + help + Bluetooth Low Energy includes support low-energy physical + layer available with Bluetooth version 4.0 or later. config BT_6LOWPAN tristate "Bluetooth 6LoWPAN support" diff --git a/net/bluetooth/selftest.c b/net/bluetooth/selftest.c index ee92c925ecc5..34a1227f4391 100644 --- a/net/bluetooth/selftest.c +++ b/net/bluetooth/selftest.c @@ -164,7 +164,7 @@ static int __init test_ecdh_sample(const u8 priv_a[32], const u8 priv_b[32], ret = -EINVAL; out: - kfree(dhkey_a); + kfree(tmp); return ret; } |