Bluetooth: Support resolvable private addresses
authorAndre Guedes <andre.guedes@openbossa.org>
Wed, 26 Feb 2014 23:21:53 +0000 (20:21 -0300)
committerMarcel Holtmann <marcel@holtmann.org>
Thu, 27 Feb 2014 03:41:35 +0000 (19:41 -0800)
Only identity addresses are inserted into hdev->pend_le_conns. So,
in order to support resolvable private addresses in auto connection
mechanism, we should resolve the address before checking for pending
connections.

Thus, this patch adds an extra check in check_pending_le_conn() and
updates 'addr' and 'addr_type' variables before hci_pend_le_conn_
lookup().

Signed-off-by: Andre Guedes <andre.guedes@openbossa.org>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
net/bluetooth/hci_event.c

index 46da8b6f4368dc38f1d248d87f4908e168d59df4..cda92db2a9fc038243c98b35e360cec79c736dad 100644 (file)
@@ -3706,6 +3706,16 @@ static void check_pending_le_conn(struct hci_dev *hdev, bdaddr_t *addr,
                                  u8 addr_type)
 {
        struct hci_conn *conn;
+       struct smp_irk *irk;
+
+       /* If this is a resolvable address, we should resolve it and then
+        * update address and address type variables.
+        */
+       irk = hci_get_irk(hdev, addr, addr_type);
+       if (irk) {
+               addr = &irk->bdaddr;
+               addr_type = irk->addr_type;
+       }
 
        if (!hci_pend_le_conn_lookup(hdev, addr, addr_type))
                return;