diff options
author | Johan Hedberg <johan.hedberg@intel.com> | 2012-02-22 17:38:59 -0500 |
---|---|---|
committer | Johan Hedberg <johan.hedberg@intel.com> | 2012-02-23 06:07:01 -0500 |
commit | 388fc8faf200f80159353eb86cde4ab75d0a0bbd (patch) | |
tree | e6cfe71be84ad9a14c534ef01b2c4fb0be8f1118 /include | |
parent | 9a395a80dc6a2004787539dcc0c7d167ba87e89a (diff) |
Bluetooth: mgmt: Add legacy pairing info to dev_found events
This patch makes sure that legacy pairing vs SSP infomation gets
properly propageted to the device_found events in the form of the legacy
pairing flag.
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Acked-by: Marcel Holtmann <marcel@holtmann.org>
Diffstat (limited to 'include')
-rw-r--r-- | include/net/bluetooth/hci_core.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h index 3fcc7f0d08c3..720bdc26b7e9 100644 --- a/include/net/bluetooth/hci_core.h +++ b/include/net/bluetooth/hci_core.h | |||
@@ -407,7 +407,7 @@ struct inquiry_entry *hci_inquiry_cache_lookup_resolve(struct hci_dev *hdev, | |||
407 | void hci_inquiry_cache_update_resolve(struct hci_dev *hdev, | 407 | void hci_inquiry_cache_update_resolve(struct hci_dev *hdev, |
408 | struct inquiry_entry *ie); | 408 | struct inquiry_entry *ie); |
409 | bool hci_inquiry_cache_update(struct hci_dev *hdev, struct inquiry_data *data, | 409 | bool hci_inquiry_cache_update(struct hci_dev *hdev, struct inquiry_data *data, |
410 | bool name_known); | 410 | bool name_known, bool *ssp); |
411 | 411 | ||
412 | /* ----- HCI Connections ----- */ | 412 | /* ----- HCI Connections ----- */ |
413 | enum { | 413 | enum { |
@@ -1018,7 +1018,8 @@ int mgmt_read_local_oob_data_reply_complete(struct hci_dev *hdev, u8 *hash, | |||
1018 | int mgmt_le_enable_complete(struct hci_dev *hdev, u8 enable, u8 status); | 1018 | int mgmt_le_enable_complete(struct hci_dev *hdev, u8 enable, u8 status); |
1019 | int mgmt_device_found(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 link_type, | 1019 | int mgmt_device_found(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 link_type, |
1020 | u8 addr_type, u8 *dev_class, s8 rssi, | 1020 | u8 addr_type, u8 *dev_class, s8 rssi, |
1021 | u8 cfm_name, u8 *eir, u16 eir_len); | 1021 | u8 cfm_name, u8 ssp, u8 *eir, |
1022 | u16 eir_len); | ||
1022 | int mgmt_remote_name(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 link_type, | 1023 | int mgmt_remote_name(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 link_type, |
1023 | u8 addr_type, s8 rssi, u8 *name, u8 name_len); | 1024 | u8 addr_type, s8 rssi, u8 *name, u8 name_len); |
1024 | int mgmt_start_discovery_failed(struct hci_dev *hdev, u8 status); | 1025 | int mgmt_start_discovery_failed(struct hci_dev *hdev, u8 status); |