---

yaml --- r: 255837 b: refs/heads/master c: 88167ae h: refs/heads/master i: 255835: 1e16ae6 v: v3
git-mirror · Jun 13, 2011 · 4271202 · 4271202
1 parent 1b30b2d
commit 4271202
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: 7b5c0d5242295a3b52e7161bf129e2f0e8c624cb
+refs/heads/master: 88167aed0d2e84364c8f0d9e48429c21fc7894c3
diff --git a/trunk/include/net/bluetooth/hci_core.h b/trunk/include/net/bluetooth/hci_core.h
@@ -745,6 +745,9 @@ static inline void hci_encrypt_cfm(struct hci_conn *conn, __u8 status,
 	if (conn->sec_level == BT_SECURITY_SDP)
 		conn->sec_level = BT_SECURITY_LOW;
 
+	if (conn->pending_sec_level > conn->sec_level)
+		conn->sec_level = conn->pending_sec_level;
+
 	hci_proto_encrypt_cfm(conn, status, encrypt);
 
 	read_lock_bh(&hci_cb_list_lock);