From 4271202e144b863925f08dfc1993dc199d3599a5 Mon Sep 17 00:00:00 2001 From: Vinicius Costa Gomes Date: Thu, 9 Jun 2011 18:50:51 -0300 Subject: [PATCH] --- yaml --- r: 255837 b: refs/heads/master c: 88167aed0d2e84364c8f0d9e48429c21fc7894c3 h: refs/heads/master i: 255835: 1e16ae656bdd01816ca8932b3778628857692542 v: v3 --- [refs] | 2 +- trunk/include/net/bluetooth/hci_core.h | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 4247f1ad8efd..af2b26af7740 100644 --- 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 index ab6842c6e49a..fe05946c8f0b 100644 --- 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);