---

yaml --- r: 247263 b: refs/heads/master c: 655fe6e h: refs/heads/master i: 247261: 3081485 247259: 09ea812 247255: cbc5168 247247: b0c7177 247231: c228e3f v: v3
git-mirror · Apr 28, 2011 · 59e70fc · 59e70fc
1 parent 279d17f
commit 59e70fc
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 12adcf3a953c3aa4006d855aa638133bf018ceac
+refs/heads/master: 655fe6ece7e71b37c17577ae485d11bf701c95f7
diff --git a/trunk/net/bluetooth/hci_core.c b/trunk/net/bluetooth/hci_core.c
@@ -1083,8 +1083,11 @@ int hci_add_link_key(struct hci_dev *hdev, struct hci_conn *conn, int new_key,
 	 * previous key */
 	if (type == HCI_LK_CHANGED_COMBINATION &&
 					(!conn || conn->remote_auth == 0xff) &&
-					old_key_type == 0xff)
+					old_key_type == 0xff) {
 		type = HCI_LK_COMBINATION;
+		if (conn)
+			conn->key_type = type;
+	}
 
 	if (new_key && !hci_persistent_key(hdev, conn, type, old_key_type)) {
 		list_del(&key->list);