Bluetooth: Add dst_type parameter to hci_connect

This patch adds the dst_type parameter to hci_connect function.
Instead of searching the address type in advertising cache, we
use the dst_type parameter to establish LE connections.

The dst_type is ignored for BR/EDR connection establishment.

Signed-off-by: Andre Guedes <andre.guedes@openbossa.org>
Acked-by: Johan Hedberg <johan.hedberg@intel.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>

4 files changed, 13 insertions, 17 deletions

diff --git a/net/bluetooth/hci_conn.c b/net/bluetooth/hci_conn.c
index 8f352cd1745a..a3ee1a929a6c 100644
--- a/net/bluetooth/hci_conn.c
+++ b/net/bluetooth/hci_conn.c
@@ -513,7 +513,8 @@ EXPORT_SYMBOL(hci_get_route);
 
 /* Create SCO, ACL or LE connection.
  * Device _must_ be locked */
-struct hci_conn *hci_connect(struct hci_dev *hdev, int type, bdaddr_t *dst, __u8 sec_level, __u8 auth_type)
+struct hci_conn *hci_connect(struct hci_dev *hdev, int type, bdaddr_t *dst,
+                             __u8 dst_type, __u8 sec_level, __u8 auth_type)
 {
         struct hci_conn *acl;
         struct hci_conn *sco;
@@ -522,19 +523,13 @@ 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 = NULL;
-
                 le = hci_conn_hash_lookup_ba(hdev, LE_LINK, dst);
                 if (!le) {
-                        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;
+                        le->dst_type = bdaddr_to_le(dst_type);
                         hci_le_connect(le);
                 }
 
diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c
index 97af2b4f6238..61af06d35335 100644
--- a/net/bluetooth/l2cap_core.c
+++ b/net/bluetooth/l2cap_core.c
@@ -1479,11 +1479,11 @@ int l2cap_chan_connect(struct l2cap_chan *chan, __le16 psm, u16 cid, bdaddr_t *d
         auth_type = l2cap_get_auth_type(chan);
 
         if (chan->dcid == L2CAP_CID_LE_DATA)
-                hcon = hci_connect(hdev, LE_LINK, dst,
-                                        chan->sec_level, auth_type);
+                hcon = hci_connect(hdev, LE_LINK, dst, BDADDR_LE_RANDOM,
+                                   chan->sec_level, auth_type);
         else
-                hcon = hci_connect(hdev, ACL_LINK, dst,
-                                        chan->sec_level, auth_type);
+                hcon = hci_connect(hdev, ACL_LINK, dst, BDADDR_BREDR,
+                                   chan->sec_level, auth_type);
 
         if (IS_ERR(hcon)) {
                 err = PTR_ERR(hcon);
diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c
index 4e26c2585817..9038118d37a3 100644
--- a/net/bluetooth/mgmt.c
+++ b/net/bluetooth/mgmt.c
@@ -1903,11 +1903,11 @@ static int pair_device(struct sock *sk, struct hci_dev *hdev, void *data,
                 auth_type = HCI_AT_DEDICATED_BONDING_MITM;
 
         if (cp->addr.type == BDADDR_BREDR)
-                conn = hci_connect(hdev, ACL_LINK, &cp->addr.bdaddr, sec_level,
-                                   auth_type);
+                conn = hci_connect(hdev, ACL_LINK, &cp->addr.bdaddr,
+                                   cp->addr.type, sec_level, auth_type);
         else
-                conn = hci_connect(hdev, LE_LINK, &cp->addr.bdaddr, sec_level,
-                                   auth_type);
+                conn = hci_connect(hdev, LE_LINK, &cp->addr.bdaddr,
+                                   cp->addr.type, sec_level, auth_type);
 
         memset(&rp, 0, sizeof(rp));
         bacpy(&rp.addr.bdaddr, &cp->addr.bdaddr);
diff --git a/net/bluetooth/sco.c b/net/bluetooth/sco.c
index bf1af0b1497e..cbdd313659a7 100644
--- a/net/bluetooth/sco.c
+++ b/net/bluetooth/sco.c
@@ -193,7 +193,8 @@ static int sco_connect(struct sock *sk)
         else
                 type = SCO_LINK;
 
-        hcon = hci_connect(hdev, type, dst, BT_SECURITY_LOW, HCI_AT_NO_BONDING);
+        hcon = hci_connect(hdev, type, dst, BDADDR_BREDR, BT_SECURITY_LOW,
+                           HCI_AT_NO_BONDING);
         if (IS_ERR(hcon)) {
                 err = PTR_ERR(hcon);
                 goto done;