evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Bluetooth: Fix establishing ESCO links

Browse source 
Commit 4cd2d98340 "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: Vinicius Costa Gomes <vinicius.gomes@openbossa.org>
Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
This commit is contained in:
Vinicius Costa Gomes 2012-08-17 21:37:59 -03:00 • committed by Gustavo Padovan
parent 144ad33020
commit f91c8468df
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
net/bluetooth/hci_conn.c
View file

@ -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,
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,
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);