diff options
author | Johan Hedberg <johan.hedberg@intel.com> | 2012-01-25 07:21:06 -0500 |
---|---|---|
committer | Johan Hedberg <johan.hedberg@intel.com> | 2012-02-13 10:01:29 -0500 |
commit | 84bde9d6c0e6830f4a8685a5d237965053118bf9 (patch) | |
tree | bb6bce4d3477ebee0a4027e30103201fbbd74ea8 /net/bluetooth/hci_conn.c | |
parent | 58a681ef1455aef9caad1d41073868fb399373f6 (diff) |
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.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/bluetooth/hci_conn.c b/net/bluetooth/hci_conn.c index 8288e303621a..6ec259e84b95 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) | |||
609 | BT_DBG("conn %p", conn); | 609 | BT_DBG("conn %p", conn); |
610 | 610 | ||
611 | if (test_bit(HCI_CONN_SSP_ENABLED, &conn->flags) && | 611 | if (test_bit(HCI_CONN_SSP_ENABLED, &conn->flags) && |
612 | conn->hdev->ssp_mode > 0 && | 612 | test_bit(HCI_SSP_ENABLED, &conn->hdev->dev_flags) && |
613 | !(conn->link_mode & HCI_LM_ENCRYPT)) | 613 | !(conn->link_mode & HCI_LM_ENCRYPT)) |
614 | return 0; | 614 | return 0; |
615 | 615 | ||
616 | return 1; | 616 | return 1; |
@@ -674,7 +674,7 @@ int hci_conn_security(struct hci_conn *conn, __u8 sec_level, __u8 auth_type) | |||
674 | key. */ | 674 | key. */ |
675 | if (sec_level == BT_SECURITY_LOW && | 675 | if (sec_level == BT_SECURITY_LOW && |
676 | (!test_bit(HCI_CONN_SSP_ENABLED, &conn->flags) || | 676 | (!test_bit(HCI_CONN_SSP_ENABLED, &conn->flags) || |
677 | !conn->hdev->ssp_mode)) | 677 | !test_bit(HCI_SSP_ENABLED, &conn->hdev->dev_flags))) |
678 | return 1; | 678 | return 1; |
679 | 679 | ||
680 | /* For other security levels we need the link key. */ | 680 | /* For other security levels we need the link key. */ |