---

yaml --- r: 290921 b: refs/heads/master c: b0dbfb4 h: refs/heads/master i: 290919: 71fbf12 v: v3
git-mirror · Feb 13, 2012 · c031c36 · c031c36
1 parent 24e6104
commit c031c36
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git 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
@@ -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;