Commit 079446c8 authored by Johan Hedberg's avatar Johan Hedberg Committed by Marcel Holtmann
Browse files

Bluetooth: Support scanning for devices using RPA



When we're scanning for specific devices that use an RPA we need to
convert the RPA to the identity address before looking up the entry in
the connection parameters. This patch adds the necessary code to do this
in the process_adv_report() function.

Signed-off-by: default avatarJohan Hedberg <johan.hedberg@intel.com>
Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
parent 0d2bf134
Loading
Loading
Loading
Loading
+12 −0
Original line number Diff line number Diff line
@@ -4231,6 +4231,7 @@ static void process_adv_report(struct hci_dev *hdev, u8 type, bdaddr_t *bdaddr,
	 */
	if (hdev->le_scan_type == LE_SCAN_PASSIVE) {
		struct hci_conn_params *param;
		struct smp_irk *irk;

		if (type == LE_ADV_IND || type == LE_ADV_DIRECT_IND)
			check_pending_le_conn(hdev, bdaddr, bdaddr_type);
@@ -4241,6 +4242,17 @@ static void process_adv_report(struct hci_dev *hdev, u8 type, bdaddr_t *bdaddr,
		if (type == LE_ADV_DIRECT_IND)
			return;

		/* Check if we need to convert to identity address */
		irk = hci_get_irk(hdev, bdaddr, bdaddr_type);
		if (irk) {
			bdaddr = &irk->bdaddr;
			bdaddr_type = irk->addr_type;
		}

		/* The conn params list only contains identity addresses */
		if (!hci_is_identity_address(bdaddr, bdaddr_type))
			return;

		param = hci_conn_params_lookup(hdev, bdaddr, bdaddr_type);
		if (!param || param->auto_connect != HCI_AUTO_CONN_REPORT)
			return;