forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth

Browse source 
Conflicts:
	net/bluetooth/hci_core.c
This commit is contained in:
Gustavo Padovan 2013-09-27 11:56:14 -03:00
commit 1025c04cec
5575 changed files with 380950 additions and 176159 deletions
Download patch file Download diff file Expand all files Collapse all files

6
net/bluetooth/hci_event.c
View file

@ -3557,7 +3557,11 @@ static void hci_le_ltk_request_evt(struct hci_dev *hdev, struct sk_buff *skb)
cp.handle = cpu_to_le16(conn->handle);
if (ltk->authenticated)
conn->sec_level = BT_SECURITY_HIGH;
conn->pending_sec_level = BT_SECURITY_HIGH;
else
conn->pending_sec_level = BT_SECURITY_MEDIUM;
conn->enc_key_size = ltk->enc_size;
hci_send_cmd(hdev, HCI_OP_LE_LTK_REPLY, sizeof(cp), &cp);