From 59e70fcd7072a387c96a61c77d1bcaebdffdbfc0 Mon Sep 17 00:00:00 2001
From: Johan Hedberg <johan.hedberg@nokia.com>
Date: Thu, 28 Apr 2011 11:29:01 -0700
Subject: [PATCH] --- yaml --- r: 247263 b: refs/heads/master c:
 655fe6ece7e71b37c17577ae485d11bf701c95f7 h: refs/heads/master i:   247261:
 30814850d860b1a001ca2afc8c464d06f203fe7a   247259:
 09ea812fef5f9743f668ba60eef2dd9276194f49   247255:
 cbc5168f3605f0a5ea97d558f1bb1600e66d7c9c   247247:
 b0c717791b1bc31ab8e42748d528325a8dbaf69c   247231:
 c228e3f5b8fe7aadbee686684beec95d8450286a v: v3

---
 [refs]                         | 2 +-
 trunk/net/bluetooth/hci_core.c | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index ec7fb34758b5..caa6ece2aa23 100644
--- 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
index 2ac6036b70c3..59ca4755b6b3 100644
--- 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);