summaryrefslogtreecommitdiffstats
path: root/net/bluetooth/hci_conn.c
diff options
context:
space:
mode:
authorJohan Hedberg <johan.hedberg@intel.com>2012-01-25 14:21:06 +0200
committerJohan Hedberg <johan.hedberg@intel.com>2012-02-13 17:01:29 +0200
commit84bde9d6c0e6830f4a8685a5d237965053118bf9 (patch)
treebb6bce4d3477ebee0a4027e30103201fbbd74ea8 /net/bluetooth/hci_conn.c
parent58a681ef1455aef9caad1d41073868fb399373f6 (diff)
downloadop-kernel-dev-84bde9d6c0e6830f4a8685a5d237965053118bf9.zip
op-kernel-dev-84bde9d6c0e6830f4a8685a5d237965053118bf9.tar.gz
Bluetooth: Convert hdev->ssp_mode to a flag
The ssp_mode is essentially just a boolean so it's more appropriate to have it simply as a flag in hdev->dev_flags. Signed-off-by: Johan Hedberg <johan.hedberg@intel.com> Acked-by: Marcel Holtmann <marcel@holtmann.org>
Diffstat (limited to 'net/bluetooth/hci_conn.c')
-rw-r--r--net/bluetooth/hci_conn.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/net/bluetooth/hci_conn.c b/net/bluetooth/hci_conn.c
index 8288e30..6ec259e 100644
--- a/net/bluetooth/hci_conn.c
+++ b/net/bluetooth/hci_conn.c
@@ -609,8 +609,8 @@ int hci_conn_check_link_mode(struct hci_conn *conn)
BT_DBG("conn %p", conn);
if (test_bit(HCI_CONN_SSP_ENABLED, &conn->flags) &&
- conn->hdev->ssp_mode > 0 &&
- !(conn->link_mode & HCI_LM_ENCRYPT))
+ test_bit(HCI_SSP_ENABLED, &conn->hdev->dev_flags) &&
+ !(conn->link_mode & HCI_LM_ENCRYPT))
return 0;
return 1;
@@ -674,7 +674,7 @@ int hci_conn_security(struct hci_conn *conn, __u8 sec_level, __u8 auth_type)
key. */
if (sec_level == BT_SECURITY_LOW &&
(!test_bit(HCI_CONN_SSP_ENABLED, &conn->flags) ||
- !conn->hdev->ssp_mode))
+ !test_bit(HCI_SSP_ENABLED, &conn->hdev->dev_flags)))
return 1;
/* For other security levels we need the link key. */
OpenPOWER on IntegriCloud