Bluetooth: Initialize hci_conn fields in hci_connect_le

This patch moves some hci_conn fields initialization from hci_le_
create_connection() to hci_connect_le(). It makes more sense to
initialize these fields within the function that creates the hci_
conn object.

Signed-off-by: Andre Guedes <andre.guedes@openbossa.org>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>

diff --git a/net/bluetooth/hci_conn.c b/net/bluetooth/hci_conn.c
index 5aba520cddfe788f2828ac85998a7c09bfb5c9a0..08e601c68314c1e1d4132d369c1ac18b73dac6c0 100644 (file)
--- 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)
        struct hci_dev *hdev = conn->hdev;
        struct hci_cp_le_create_conn cp;
 
-       conn->state = BT_CONNECT;
-       conn->out = true;
-       conn->link_mode |= HCI_LM_MASTER;
-       conn->sec_level = BT_SECURITY_LOW;
-
        memset(&cp, 0, sizeof(cp));
        cp.scan_interval = __constant_cpu_to_le16(0x0060);
        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,
                        return ERR_PTR(-ENOMEM);
 
                conn->dst_type = bdaddr_to_le(dst_type);
+               conn->state = BT_CONNECT;
+               conn->out = true;
+               conn->link_mode |= HCI_LM_MASTER;
+               conn->sec_level = BT_SECURITY_LOW;
+
                hci_le_create_connection(conn);
        }