Commit 89036a2a authored by David S. Miller's avatar David S. Miller

Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth

Johan Hedberg says:

====================
pull request: bluetooth 2018-03-05

Here are a few more Bluetooth fixes for the 4.16 kernel:

 - btusb: reset/resume fixes for Yoga 920 and Dell OptiPlex 3060
 - Fix for missing encryption refresh with the Security Manager protocol
====================
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 803fafbe 64e759f5
...@@ -386,10 +386,10 @@ static const struct usb_device_id blacklist_table[] = { ...@@ -386,10 +386,10 @@ static const struct usb_device_id blacklist_table[] = {
*/ */
static const struct dmi_system_id btusb_needs_reset_resume_table[] = { static const struct dmi_system_id btusb_needs_reset_resume_table[] = {
{ {
/* Lenovo Yoga 920 (QCA Rome device 0cf3:e300) */ /* Dell OptiPlex 3060 (QCA ROME device 0cf3:e007) */
.matches = { .matches = {
DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"), DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
DMI_MATCH(DMI_PRODUCT_VERSION, "Lenovo YOGA 920"), DMI_MATCH(DMI_PRODUCT_NAME, "OptiPlex 3060"),
}, },
}, },
{} {}
......
...@@ -2296,8 +2296,14 @@ static u8 smp_cmd_security_req(struct l2cap_conn *conn, struct sk_buff *skb) ...@@ -2296,8 +2296,14 @@ static u8 smp_cmd_security_req(struct l2cap_conn *conn, struct sk_buff *skb)
else else
sec_level = authreq_to_seclevel(auth); sec_level = authreq_to_seclevel(auth);
if (smp_sufficient_security(hcon, sec_level, SMP_USE_LTK)) if (smp_sufficient_security(hcon, sec_level, SMP_USE_LTK)) {
/* If link is already encrypted with sufficient security we
* still need refresh encryption as per Core Spec 5.0 Vol 3,
* Part H 2.4.6
*/
smp_ltk_encrypt(conn, hcon->sec_level);
return 0; return 0;
}
if (sec_level > hcon->pending_sec_level) if (sec_level > hcon->pending_sec_level)
hcon->pending_sec_level = sec_level; hcon->pending_sec_level = sec_level;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment