Commit 5974e4c4 authored by Gustavo Padovan's avatar Gustavo Padovan Committed by Johan Hedberg

Bluetooth: Fix coding style in hci_conn.c

Follow net subsystem rules.
Signed-off-by: default avatarGustavo Padovan <gustavo.padovan@collabora.co.uk>
Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
parent 807deac2
...@@ -648,8 +648,7 @@ int hci_conn_security(struct hci_conn *conn, __u8 sec_level, __u8 auth_type) ...@@ -648,8 +648,7 @@ int hci_conn_security(struct hci_conn *conn, __u8 sec_level, __u8 auth_type)
/* An unauthenticated combination key has sufficient security for /* An unauthenticated combination key has sufficient security for
security level 1 and 2. */ security level 1 and 2. */
if (conn->key_type == HCI_LK_UNAUTH_COMBINATION && if (conn->key_type == HCI_LK_UNAUTH_COMBINATION &&
(sec_level == BT_SECURITY_MEDIUM || (sec_level == BT_SECURITY_MEDIUM || sec_level == BT_SECURITY_LOW))
sec_level == BT_SECURITY_LOW))
goto encrypt; goto encrypt;
/* A combination key has always sufficient security for the security /* A combination key has always sufficient security for the security
...@@ -657,8 +656,7 @@ int hci_conn_security(struct hci_conn *conn, __u8 sec_level, __u8 auth_type) ...@@ -657,8 +656,7 @@ int hci_conn_security(struct hci_conn *conn, __u8 sec_level, __u8 auth_type)
is generated using maximum PIN code length (16). is generated using maximum PIN code length (16).
For pre 2.1 units. */ For pre 2.1 units. */
if (conn->key_type == HCI_LK_COMBINATION && if (conn->key_type == HCI_LK_COMBINATION &&
(sec_level != BT_SECURITY_HIGH || (sec_level != BT_SECURITY_HIGH || conn->pin_length == 16))
conn->pin_length == 16))
goto encrypt; goto encrypt;
auth: auth:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment