diff --git a/[refs] b/[refs]
index a8f4dfdffc8f..55089bf04377 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0684e5f9fb9e3f7e168ab831dfca693bcb44805b
+refs/heads/master: 657e17b03c80bec817975984d221bef716f83558
diff --git a/trunk/net/bluetooth/hci_conn.c b/trunk/net/bluetooth/hci_conn.c
index 7fc4c048b57b..dcdaa4be7847 100644
--- a/trunk/net/bluetooth/hci_conn.c
+++ b/trunk/net/bluetooth/hci_conn.c
@@ -416,6 +416,9 @@ int hci_conn_security(struct hci_conn *conn, __u8 sec_level, __u8 auth_type)
 {
 	BT_DBG("conn %p", conn);
 
+	if (conn->auth_type == 0xff)
+		conn->auth_type = auth_type;
+
 	if (sec_level == BT_SECURITY_SDP)
 		return 1;