From: Waldemar Rymarkiewicz Date: Thu, 2 Jun 2011 12:24:52 +0000 (+0200) Subject: Bluetooth: Simplify hci_conn_accept_secure check X-Git-Tag: MMI-PSA29.97-13-9~18350^2~12^2~42^2~464 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=ef4177e2bf92543e422fae154888062376e2283d;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git Bluetooth: Simplify hci_conn_accept_secure check If the link key is secure (authenticated or combination 16 digit) the sec_level will be always BT_SECURITY_HIGH. Therefore, instead of checking the link key type simply check the sec_level on the link. Signed-off-by: Waldemar Rymarkiewicz Signed-off-by: Gustavo F. Padovan --- diff --git a/net/bluetooth/hci_conn.c b/net/bluetooth/hci_conn.c index 0408a93570d6..37f5a174f072 100644 --- a/net/bluetooth/hci_conn.c +++ b/net/bluetooth/hci_conn.c @@ -643,9 +643,7 @@ int hci_conn_check_secure(struct hci_conn *conn, __u8 sec_level) if (sec_level != BT_SECURITY_HIGH) return 1; /* Accept if non-secure is required */ - if (conn->key_type == HCI_LK_AUTH_COMBINATION || - (conn->key_type == HCI_LK_COMBINATION && - conn->pin_length == 16)) + if (conn->sec_level == BT_SECURITY_HIGH) return 1; return 0; /* Reject not secure link */