|
@@ -551,49 +551,6 @@ done:
|
|
hci_dev_unlock(hdev);
|
|
hci_dev_unlock(hdev);
|
|
}
|
|
}
|
|
|
|
|
|
-static int hci_create_le_conn(struct hci_conn *conn)
|
|
|
|
-{
|
|
|
|
- struct hci_dev *hdev = conn->hdev;
|
|
|
|
- struct hci_cp_le_create_conn cp;
|
|
|
|
- struct hci_request req;
|
|
|
|
- u8 own_addr_type;
|
|
|
|
- int err;
|
|
|
|
-
|
|
|
|
- hci_req_init(&req, hdev);
|
|
|
|
-
|
|
|
|
- memset(&cp, 0, sizeof(cp));
|
|
|
|
-
|
|
|
|
- /* Update random address, but set require_privacy to false so
|
|
|
|
- * that we never connect with an unresolvable address.
|
|
|
|
- */
|
|
|
|
- err = hci_update_random_address(&req, false, &own_addr_type);
|
|
|
|
- if (err < 0)
|
|
|
|
- return err;
|
|
|
|
-
|
|
|
|
- conn->src_type = own_addr_type;
|
|
|
|
-
|
|
|
|
- cp.scan_interval = cpu_to_le16(hdev->le_scan_interval);
|
|
|
|
- cp.scan_window = cpu_to_le16(hdev->le_scan_window);
|
|
|
|
- bacpy(&cp.peer_addr, &conn->dst);
|
|
|
|
- cp.peer_addr_type = conn->dst_type;
|
|
|
|
- cp.own_address_type = own_addr_type;
|
|
|
|
- cp.conn_interval_min = cpu_to_le16(conn->le_conn_min_interval);
|
|
|
|
- cp.conn_interval_max = cpu_to_le16(conn->le_conn_max_interval);
|
|
|
|
- cp.supervision_timeout = __constant_cpu_to_le16(0x002a);
|
|
|
|
- cp.min_ce_len = __constant_cpu_to_le16(0x0000);
|
|
|
|
- cp.max_ce_len = __constant_cpu_to_le16(0x0000);
|
|
|
|
-
|
|
|
|
- hci_req_add(&req, HCI_OP_LE_CREATE_CONN, sizeof(cp), &cp);
|
|
|
|
-
|
|
|
|
- err = hci_req_run(&req, create_le_conn_complete);
|
|
|
|
- if (err) {
|
|
|
|
- hci_conn_del(conn);
|
|
|
|
- return err;
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
- return 0;
|
|
|
|
-}
|
|
|
|
-
|
|
|
|
static void hci_req_add_le_create_conn(struct hci_request *req,
|
|
static void hci_req_add_le_create_conn(struct hci_request *req,
|
|
struct hci_conn *conn)
|
|
struct hci_conn *conn)
|
|
{
|
|
{
|