From c031c366797223d3694799ee7725b53f7fc27592 Mon Sep 17 00:00:00 2001
From: Vinicius Costa Gomes <vinicius.gomes@openbossa.org>
Date: Thu, 2 Feb 2012 21:08:03 -0300
Subject: [PATCH] --- yaml --- r: 290921 b: refs/heads/master c:
 b0dbfb46ba0c0d2fe4c90e2046f7b36275763a7e h: refs/heads/master i:   290919:
 71fbf12495a003844bb72e8a3a757bafcd25c5a4 v: v3

---
 [refs]                     | 2 +-
 trunk/net/bluetooth/mgmt.c | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 6126ebdc77cb..8ce7d2c5601d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 346af67b8d116f01ef696fd47959a55deb2db8b6
+refs/heads/master: b0dbfb46ba0c0d2fe4c90e2046f7b36275763a7e
diff --git a/trunk/net/bluetooth/mgmt.c b/trunk/net/bluetooth/mgmt.c
index fd0b08115f2e..9e5dead1dbef 100644
--- a/trunk/net/bluetooth/mgmt.c
+++ b/trunk/net/bluetooth/mgmt.c
@@ -1089,6 +1089,12 @@ static int remove_keys(struct sock *sk, u16 index, void *data, u16 len)
 	bacpy(&rp.bdaddr, &cp->bdaddr);
 	rp.status = MGMT_STATUS_FAILED;
 
+	err = hci_remove_ltk(hdev, &cp->bdaddr);
+	if (err < 0) {
+		err = cmd_status(sk, index, MGMT_OP_REMOVE_KEYS, -err);
+		goto unlock;
+	}
+
 	err = hci_remove_link_key(hdev, &cp->bdaddr);
 	if (err < 0) {
 		rp.status = MGMT_STATUS_NOT_PAIRED;