---

yaml --- r: 134731 b: refs/heads/master c: 657e17b h: refs/heads/master i: 134729: 1bf9ba2 134727: 39b1a24 v: v3
git-mirror · Feb 27, 2009 · d39418e · d39418e
1 parent baa109a
commit d39418e
Show file tree

Hide file tree

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