Commit f91c8468 authored by Vinicius Costa Gomes's avatar Vinicius Costa Gomes Committed by Gustavo Padovan

Bluetooth: Fix establishing ESCO links

Commit 4cd2d983 "Bluetooth: Simplify
the connection type handling" broke the creation of ESCO links.

This patch adds a type parameter to hci_connect_sco() so it creates
the connection of the right kind.
Signed-off-by: default avatarVinicius Costa Gomes <vinicius.gomes@openbossa.org>
Signed-off-by: default avatarGustavo Padovan <gustavo.padovan@collabora.co.uk>
parent 144ad330
...@@ -521,8 +521,8 @@ static struct hci_conn *hci_connect_acl(struct hci_dev *hdev, bdaddr_t *dst, ...@@ -521,8 +521,8 @@ static struct hci_conn *hci_connect_acl(struct hci_dev *hdev, bdaddr_t *dst,
return acl; return acl;
} }
static struct hci_conn *hci_connect_sco(struct hci_dev *hdev, bdaddr_t *dst, static struct hci_conn *hci_connect_sco(struct hci_dev *hdev, int type,
u8 sec_level, u8 auth_type) bdaddr_t *dst, u8 sec_level, u8 auth_type)
{ {
struct hci_conn *acl; struct hci_conn *acl;
struct hci_conn *sco; struct hci_conn *sco;
...@@ -531,9 +531,9 @@ static struct hci_conn *hci_connect_sco(struct hci_dev *hdev, bdaddr_t *dst, ...@@ -531,9 +531,9 @@ static struct hci_conn *hci_connect_sco(struct hci_dev *hdev, bdaddr_t *dst,
if (IS_ERR(acl)) if (IS_ERR(acl))
return acl; return acl;
sco = hci_conn_hash_lookup_ba(hdev, SCO_LINK, dst); sco = hci_conn_hash_lookup_ba(hdev, type, dst);
if (!sco) { if (!sco) {
sco = hci_conn_add(hdev, SCO_LINK, dst); sco = hci_conn_add(hdev, type, dst);
if (!sco) { if (!sco) {
hci_conn_put(acl); hci_conn_put(acl);
return ERR_PTR(-ENOMEM); return ERR_PTR(-ENOMEM);
...@@ -574,7 +574,8 @@ struct hci_conn *hci_connect(struct hci_dev *hdev, int type, bdaddr_t *dst, ...@@ -574,7 +574,8 @@ struct hci_conn *hci_connect(struct hci_dev *hdev, int type, bdaddr_t *dst,
case ACL_LINK: case ACL_LINK:
return hci_connect_acl(hdev, dst, sec_level, auth_type); return hci_connect_acl(hdev, dst, sec_level, auth_type);
case SCO_LINK: case SCO_LINK:
return hci_connect_sco(hdev, dst, sec_level, auth_type); case ESCO_LINK:
return hci_connect_sco(hdev, type, dst, sec_level, auth_type);
} }
return ERR_PTR(-EINVAL); return ERR_PTR(-EINVAL);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment