Hi Marcel, On Wed, Oct 2, 2013 at 1:57 AM, Marcel Holtmann <marcel@xxxxxxxxxxxx> wrote: > > Hi Andre, > > > 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@xxxxxxxxxxxxx> > > --- > > net/bluetooth/hci_conn.c | 10 +++++----- > > 1 file changed, 5 insertions(+), 5 deletions(-) > > > > diff --git a/net/bluetooth/hci_conn.c b/net/bluetooth/hci_conn.c > > index d2380e0..f473605 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) > > 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); > > > > le->dst_type = bdaddr_to_le(dst_type); > > + le->state = BT_CONNECT; > > + le->out = true; > > + le->link_mode |= HCI_LM_MASTER; > > + le->sec_level = BT_SECURITY_LOW; > > + > > hci_le_create_connection(le); > > } > > I do not understand on how this is the same. Maybe the confusion is the use of le-> instead of conn-> as variable for hci_conn. Seems that should be fixed first. Yes, I don't really like le-> either. I'll replace le-> by conn-> in this function in a first patch. Andre -- To unsubscribe from this list: send the line "unsubscribe linux-bluetooth" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
