|
@@ -549,31 +549,31 @@ EXPORT_SYMBOL(hci_get_route);
|
|
|
static struct hci_conn *hci_connect_le(struct hci_dev *hdev, bdaddr_t *dst,
|
|
|
u8 dst_type, u8 sec_level, u8 auth_type)
|
|
|
{
|
|
|
- struct hci_conn *le;
|
|
|
+ struct hci_conn *conn;
|
|
|
|
|
|
if (test_bit(HCI_LE_PERIPHERAL, &hdev->flags))
|
|
|
return ERR_PTR(-ENOTSUPP);
|
|
|
|
|
|
- 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)
|
|
|
+ conn = hci_conn_hash_lookup_ba(hdev, LE_LINK, dst);
|
|
|
+ if (!conn) {
|
|
|
+ conn = hci_conn_hash_lookup_state(hdev, LE_LINK, BT_CONNECT);
|
|
|
+ if (conn)
|
|
|
return ERR_PTR(-EBUSY);
|
|
|
|
|
|
- le = hci_conn_add(hdev, LE_LINK, dst);
|
|
|
- if (!le)
|
|
|
+ conn = hci_conn_add(hdev, LE_LINK, dst);
|
|
|
+ if (!conn)
|
|
|
return ERR_PTR(-ENOMEM);
|
|
|
|
|
|
- le->dst_type = bdaddr_to_le(dst_type);
|
|
|
- hci_le_create_connection(le);
|
|
|
+ conn->dst_type = bdaddr_to_le(dst_type);
|
|
|
+ hci_le_create_connection(conn);
|
|
|
}
|
|
|
|
|
|
- le->pending_sec_level = sec_level;
|
|
|
- le->auth_type = auth_type;
|
|
|
+ conn->pending_sec_level = sec_level;
|
|
|
+ conn->auth_type = auth_type;
|
|
|
|
|
|
- hci_conn_hold(le);
|
|
|
+ hci_conn_hold(conn);
|
|
|
|
|
|
- return le;
|
|
|
+ return conn;
|
|
|
}
|
|
|
|
|
|
static struct hci_conn *hci_connect_acl(struct hci_dev *hdev, bdaddr_t *dst,
|