diff options
author | Andre Guedes <andre.guedes@openbossa.org> | 2011-05-31 14:20:56 -0300 |
---|---|---|
committer | Jaikumar Ganesh <jaikumar@google.com> | 2011-07-11 11:59:16 -0700 |
commit | 5e89ece9dd1b6797078085519a8a52ec64511d24 (patch) | |
tree | 1d27674d087b68c85093b31d13a486f822241c50 | |
parent | 92398c8163acd942de0a7c7d2d7abcf5ca3d02af (diff) | |
download | kernel_samsung_tuna-5e89ece9dd1b6797078085519a8a52ec64511d24.zip kernel_samsung_tuna-5e89ece9dd1b6797078085519a8a52ec64511d24.tar.gz kernel_samsung_tuna-5e89ece9dd1b6797078085519a8a52ec64511d24.tar.bz2 |
Bluetooth: Check advertising cache in hci_connect()
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.
Change-Id: I234912abc53b859becbe79625b08bc3b6eacc143
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>
-rw-r--r-- | net/bluetooth/hci_conn.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/net/bluetooth/hci_conn.c b/net/bluetooth/hci_conn.c index 0903eff..1de9c1c 100644 --- a/net/bluetooth/hci_conn.c +++ b/net/bluetooth/hci_conn.c @@ -458,13 +458,22 @@ struct hci_conn *hci_connect(struct hci_dev *hdev, int type, 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, 0, dst); if (!le) return ERR_PTR(-ENOMEM); + le->dst_type = entry->bdaddr_type; + hci_le_connect(le); hci_conn_hold(le); |