From: Vinicius Costa Gomes Date: Thu, 9 Jun 2011 21:50:51 +0000 (-0300) Subject: Bluetooth: Update the security level when link is encrypted X-Git-Tag: MMI-PSA29.97-13-9~18350^2~12^2~42^2~389^2~14 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=88167aed0d2e84364c8f0d9e48429c21fc7894c3;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git Bluetooth: Update the security level when link is encrypted If the pending security level is greater than the current security level and the link is now encrypted, we should update the link security level. This is only useful for LE links, when the only event generated when SMP is sucessful in the Encrypt Change event. Signed-off-by: Vinicius Costa Gomes Signed-off-by: Gustavo F. Padovan --- diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h index ab6842c6e49a..fe05946c8f0b 100644 --- a/include/net/bluetooth/hci_core.h +++ b/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);