summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGustavo Padovan <gustavo.padovan@collabora.co.uk>2012-05-24 03:36:37 -0300
committerJohan Hedberg <johan.hedberg@intel.com>2012-06-05 06:34:09 +0300
commit6d3c730f03e0d1aed2125c1a64ad8857c63f5163 (patch)
tree0e0fd6d8c02863fbda9b00e1e13b67aacdd52116
parent37ed561e823f5f91ca87522d61a57974be583c0d (diff)
downloadop-kernel-dev-6d3c730f03e0d1aed2125c1a64ad8857c63f5163.zip
op-kernel-dev-6d3c730f03e0d1aed2125c1a64ad8857c63f5163.tar.gz
Bluetooth: Use lmp_ssp_capable() macro
Make the check more user friendly. Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk> Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
-rw-r--r--net/bluetooth/hci_event.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c
index 5e24a57..80f209b 100644
--- a/net/bluetooth/hci_event.c
+++ b/net/bluetooth/hci_event.c
@@ -557,7 +557,7 @@ static void hci_setup(struct hci_dev *hdev)
if (hdev->hci_ver > BLUETOOTH_VER_1_1)
hci_send_cmd(hdev, HCI_OP_READ_LOCAL_COMMANDS, 0, NULL);
- if (hdev->features[6] & LMP_SIMPLE_PAIR) {
+ if (lmp_ssp_capable(hdev)) {
if (test_bit(HCI_SSP_ENABLED, &hdev->dev_flags)) {
u8 mode = 0x01;
hci_send_cmd(hdev, HCI_OP_WRITE_SSP_MODE,
OpenPOWER on IntegriCloud