github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-09 23:23:53 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

Revert Bluetooth: Use the stored LTK for restabilishing security

Browse Source 
This patch reverts commit b7d6cd72ce.
This patch was already applied upstream and then modified, then was
accidentally applied again to the android-3.4 tree.

Change-Id: I0c5a822f3f2a5b75564eeeb2598f13b7a149c58d
Reported-by: Andrey Konovalov <andrey.konovalov@linaro.org>
Signed-off-by: John Stultz <john.stultz@linaro.org>
This commit is contained in:
John Stultz 2012-04-17 13:00:43 -07:00 committed by Colin Cross
parent 53013da678
commit 6ff6845be0
1 changed files with 0 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
net/bluetooth/smp.c
View File

@ -785,17 +785,6 @@ int smp_conn_security(struct l2cap_conn *conn, __u8 sec_level)
if (hcon->link_mode & HCI_LM_MASTER) {
struct smp_cmd_pairing cp;
struct link_key *key;
key = hci_find_link_key_type(hcon->hdev, conn->dst,
HCI_LK_SMP_LTK);
if (key) {
struct key_master_id *master = (void *) key->data;
hci_le_start_enc(hcon, master->ediv, master->rand,
key->val);
goto done;
}
build_pairing_cmd(conn, &cp, NULL, authreq);
smp->preq[0] = SMP_CMD_PAIRING_REQ;