diff options
Diffstat (limited to 'net/bluetooth/hci_conn.c')
-rw-r--r-- | net/bluetooth/hci_conn.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/net/bluetooth/hci_conn.c b/net/bluetooth/hci_conn.c index 5aba520cddfe..08e601c68314 100644 --- a/net/bluetooth/hci_conn.c +++ b/net/bluetooth/hci_conn.c | |||
@@ -54,11 +54,6 @@ static void hci_le_create_connection(struct hci_conn *conn) | |||
54 | struct hci_dev *hdev = conn->hdev; | 54 | struct hci_dev *hdev = conn->hdev; |
55 | struct hci_cp_le_create_conn cp; | 55 | struct hci_cp_le_create_conn cp; |
56 | 56 | ||
57 | conn->state = BT_CONNECT; | ||
58 | conn->out = true; | ||
59 | conn->link_mode |= HCI_LM_MASTER; | ||
60 | conn->sec_level = BT_SECURITY_LOW; | ||
61 | |||
62 | memset(&cp, 0, sizeof(cp)); | 57 | memset(&cp, 0, sizeof(cp)); |
63 | cp.scan_interval = __constant_cpu_to_le16(0x0060); | 58 | cp.scan_interval = __constant_cpu_to_le16(0x0060); |
64 | cp.scan_window = __constant_cpu_to_le16(0x0030); | 59 | cp.scan_window = __constant_cpu_to_le16(0x0030); |
@@ -565,6 +560,11 @@ static struct hci_conn *hci_connect_le(struct hci_dev *hdev, bdaddr_t *dst, | |||
565 | return ERR_PTR(-ENOMEM); | 560 | return ERR_PTR(-ENOMEM); |
566 | 561 | ||
567 | conn->dst_type = bdaddr_to_le(dst_type); | 562 | conn->dst_type = bdaddr_to_le(dst_type); |
563 | conn->state = BT_CONNECT; | ||
564 | conn->out = true; | ||
565 | conn->link_mode |= HCI_LM_MASTER; | ||
566 | conn->sec_level = BT_SECURITY_LOW; | ||
567 | |||
568 | hci_le_create_connection(conn); | 568 | hci_le_create_connection(conn); |
569 | } | 569 | } |
570 | 570 | ||