summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSathish Narasimman <nsathish41@gmail.com>2020-07-23 18:08:59 +0530
committerMarcel Holtmann <marcel@holtmann.org>2020-07-30 09:34:43 +0200
commitb31bc00bfe3a4881e48e196b93cec1efb491ef2b (patch)
tree41a71ddff44412073f34d7e769d588caeae90eb6
parent0eee35bdfa3b472cc986ecc6ad76293fdcda59e2 (diff)
downloadlwn-b31bc00bfe3a4881e48e196b93cec1efb491ef2b.tar.gz
lwn-b31bc00bfe3a4881e48e196b93cec1efb491ef2b.zip
Bluetooth: Translate additional address type during le_conn
When using controller based address resolution, then the new address types 0x02 and 0x03 are used. These types need to be converted back into either public address or random address types. This patch is specially during LE_CREATE_CONN if using own_add_type as 0x02 or 0x03. Signed-off-by: Sathish Narasimman <sathish.narasimman@intel.com> Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
-rw-r--r--net/bluetooth/hci_event.c16
1 files changed, 16 insertions, 0 deletions
diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c
index 61f8c4d12028..6388fb55b4d2 100644
--- a/net/bluetooth/hci_event.c
+++ b/net/bluetooth/hci_event.c
@@ -2296,6 +2296,22 @@ static void cs_le_create_conn(struct hci_dev *hdev, bdaddr_t *peer_addr,
if (!conn)
return;
+ /* When using controller based address resolution, then the new
+ * address types 0x02 and 0x03 are used. These types need to be
+ * converted back into either public address or random address type
+ */
+ if (use_ll_privacy(hdev) &&
+ hci_dev_test_flag(hdev, HCI_LL_RPA_RESOLUTION)) {
+ switch (own_address_type) {
+ case ADDR_LE_DEV_PUBLIC_RESOLVED:
+ own_address_type = ADDR_LE_DEV_PUBLIC;
+ break;
+ case ADDR_LE_DEV_RANDOM_RESOLVED:
+ own_address_type = ADDR_LE_DEV_RANDOM;
+ break;
+ }
+ }
+
/* Store the initiator and responder address information which
* is needed for SMP. These values will not change during the
* lifetime of the connection.