---

yaml --- r: 232472 b: refs/heads/master c: 65cf686 h: refs/heads/master v: v3
git-mirror · Jan 19, 2011 · 90e0bbe · 90e0bbe
1 parent 5d6ee75
commit 90e0bbe
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: 88644bb9fee591b2743a881923263bc28df4cded
+refs/heads/master: 65cf686ee102b7eb0477a4bab82ff227071a0258
diff --git a/trunk/net/bluetooth/hci_conn.c b/trunk/net/bluetooth/hci_conn.c
@@ -442,6 +442,9 @@ static int hci_conn_auth(struct hci_conn *conn, __u8 sec_level, __u8 auth_type)
 	else if (conn->link_mode & HCI_LM_AUTH)
 		return 1;
 
+	/* Make sure we preserve an existing MITM requirement*/
+	auth_type |= (conn->auth_type & 0x01);
+
 	conn->auth_type = auth_type;
 
 	if (!test_and_set_bit(HCI_CONN_AUTH_PEND, &conn->pend)) {