Hi Guedes,
On Tue, Oct 1, 2013 at 7:03 PM, Andre Guedes <andre.guedes@xxxxxxxxxxxxx> wrote:
> + /* If already exists a hci_conn object for the following connection
> + * attempt, we simply update pending_sec_level and auth_type fields
> + * and return the object found.
> + */
Small textual improvement: "If a hci_conn object already exists [...]"
> le = hci_conn_hash_lookup_ba(hdev, LE_LINK, dst);
> - if (!le) {
> - le = hci_conn_hash_lookup_state(hdev, LE_LINK, BT_CONNECT);
> - if (le)
> - return ERR_PTR(-EBUSY);
> -
> - le = hci_conn_add(hdev, LE_LINK, dst);
> - if (!le)
> - 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;
> -
> - err = hci_initiate_le_connection(hdev, &le->dst, le->dst_type);
> - if (err) {
> - hci_conn_del(le);
> - return ERR_PTR(err);
> - }
> + if (le) {
> + le->pending_sec_level = sec_level;
> + le->auth_type = auth_type;
> + goto out;
> }
>
> - le->pending_sec_level = sec_level;
> + /* Since the controller supports only one LE connection attempt at the
> + * time, we return busy if there is any connection attempt running.
> + */
s/at the time/at a time/
s/busy/EBUSY/
> + le = hci_conn_hash_lookup_state(hdev, LE_LINK, BT_CONNECT);
> + if (le)
> + return ERR_PTR(-EBUSY);
> +
> + le = hci_conn_add(hdev, LE_LINK, dst);
> + if (!le)
> + 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;
> + le->pending_sec_level = BT_SECURITY_LOW;
I think the previous statement should be:
le->pending_sec_level = sec_level;
Otherwise, we are changing semantics.
> le->auth_type = auth_type;
>
> - hci_conn_hold(le);
> + err = hci_initiate_le_connection(hdev, &le->dst, le->dst_type);
> + if (err) {
> + hci_conn_del(le);
> + return ERR_PTR(err);
> + }
>
> +out:
> + hci_conn_hold(le);
> return le;
> }
Best Regards,
--
Anderson Lizardo
Instituto Nokia de Tecnologia - INdT
Manaus - Brazil
--
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
