projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Bluetooth: Use lmp_ssp_capable where applicable
[cascardo/linux.git]
/
net
/
bluetooth
/
hci_event.c
diff --git
a/net/bluetooth/hci_event.c
b/net/bluetooth/hci_event.c
index
41ff978
..
b120388
100644
(file)
--- a/
net/bluetooth/hci_event.c
+++ b/
net/bluetooth/hci_event.c
@@
-528,7
+528,7
@@
static void hci_setup_event_mask(struct hci_dev *hdev)
if (hdev->features[7] & LMP_LSTO)
events[6] |= 0x80; /* Link Supervision Timeout Changed */
if (hdev->features[7] & LMP_LSTO)
events[6] |= 0x80; /* Link Supervision Timeout Changed */
- if (
hdev->features[6] & LMP_SIMPLE_PAIR
) {
+ if (
lmp_ssp_capable(hdev)
) {
events[6] |= 0x01; /* IO Capability Request */
events[6] |= 0x02; /* IO Capability Response */
events[6] |= 0x04; /* User Confirmation Request */
events[6] |= 0x01; /* IO Capability Request */
events[6] |= 0x02; /* IO Capability Response */
events[6] |= 0x04; /* User Confirmation Request */
@@
-541,7
+541,7
@@
static void hci_setup_event_mask(struct hci_dev *hdev)
* Features Notification */
}
* Features Notification */
}
- if (
hdev->features[4] & LMP_LE
)
+ if (
lmp_le_capable(hdev)
)
events[7] |= 0x20; /* LE Meta-Event */
hci_send_cmd(hdev, HCI_OP_SET_EVENT_MASK, sizeof(events), events);
events[7] |= 0x20; /* LE Meta-Event */
hci_send_cmd(hdev, HCI_OP_SET_EVENT_MASK, sizeof(events), events);
@@
-746,7
+746,7
@@
static void hci_cc_read_local_ext_features(struct hci_dev *hdev,
break;
}
break;
}
- if (test_bit(HCI_INIT, &hdev->flags) &&
hdev->features[4] & LMP_LE
)
+ if (test_bit(HCI_INIT, &hdev->flags) &&
lmp_le_capable(hdev)
)
hci_set_le_support(hdev);
done:
hci_set_le_support(hdev);
done: