Bluetooth: Check advertising cache in hci_connect()
authorAndre Guedes <andre.guedes@openbossa.org>
Tue, 31 May 2011 17:20:56 +0000 (14:20 -0300)
committerGustavo F. Padovan <padovan@profusion.mobi>
Wed, 8 Jun 2011 19:58:18 +0000 (16:58 -0300)
When connecting to a LE device, we need to check the advertising
cache in order to know the address type of that device.

If its advertising entry is not found, the connection is not
established and hci_connect() returns error.

Signed-off-by: Andre Guedes <andre.guedes@openbossa.org>
Acked-by: Ville Tervo <ville.tervo@nokia.com>
Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>
net/bluetooth/hci_conn.c

index ca283a0..4e38b48 100644 (file)
@@ -447,13 +447,22 @@ struct hci_conn *hci_connect(struct hci_dev *hdev, int type, bdaddr_t *dst, __u8
        BT_DBG("%s dst %s", hdev->name, batostr(dst));
 
        if (type == LE_LINK) {
+               struct adv_entry *entry;
+
                le = hci_conn_hash_lookup_ba(hdev, LE_LINK, dst);
                if (le)
                        return ERR_PTR(-EBUSY);
+
+               entry = hci_find_adv_entry(hdev, dst);
+               if (!entry)
+                       return ERR_PTR(-EHOSTUNREACH);
+
                le = hci_conn_add(hdev, LE_LINK, dst);
                if (!le)
                        return ERR_PTR(-ENOMEM);
 
+               le->dst_type = entry->bdaddr_type;
+
                hci_le_connect(le);
 
                hci_conn_hold(le);