From 6f68f93ffecc57cc6b64532df7141a0b1faaf445 Mon Sep 17 00:00:00 2001
From: Andre Guedes <andre.guedes@openbossa.org>
Date: Tue, 31 May 2011 14:20:56 -0300
Subject: [PATCH] --- yaml --- r: 255707 b: refs/heads/master c:
 eda42b503a3c866d51146549fe46da1f5f64e2c7 h: refs/heads/master i:   255705:
 0d292935291ffc37cf4450d4d743f1ac93064708   255703:
 6dbc5798951bb6ae305a55f0528555683ef2294f v: v3

---
 [refs]                         | 2 +-
 trunk/net/bluetooth/hci_conn.c | 9 +++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 4499b022bec9..b70159fdb6ed 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 893d67514aebcfd3ebf17bd212ceea1e2741a443
+refs/heads/master: eda42b503a3c866d51146549fe46da1f5f64e2c7
diff --git a/trunk/net/bluetooth/hci_conn.c b/trunk/net/bluetooth/hci_conn.c
index ca283a0f63ea..4e38b4872865 100644
--- a/trunk/net/bluetooth/hci_conn.c
+++ b/trunk/net/bluetooth/hci_conn.c
@@ -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);