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 <waldemar.rymarkiewicz@tieto.com>
Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>

diff --git a/net/bluetooth/hci_conn.c b/net/bluetooth/hci_conn.c
index 0408a93570d63eede23c46911656f75cd90d7eb2..37f5a174f072eac0548451d94db1c45a7a34ca32 100644 (file)
--- 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 */