diff options
| author | John Stultz <john.stultz@linaro.org> | 2012-04-17 13:00:43 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2012-05-07 18:17:15 -0700 |
| commit | 6ff6845be02be8d53da28d2333a015d54b1234db (patch) | |
| tree | 131773e3e59a0c51bea05c18dc14f5fcd90b300b /net | |
| parent | 53013da67892f1a0e303a938816be47e3a10b1b1 (diff) | |
Revert Bluetooth: Use the stored LTK for restabilishing security
This patch reverts commit b7d6cd72ce713a256406d47e798ea4797404d81e.
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>
Diffstat (limited to 'net')
| -rw-r--r-- | net/bluetooth/smp.c | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/net/bluetooth/smp.c b/net/bluetooth/smp.c index afd92539fc0..deb119875fd 100644 --- a/net/bluetooth/smp.c +++ b/net/bluetooth/smp.c @@ -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; |