2012-08-18 00:37:59

by Vinicius Costa Gomes

Subject: [PATCH] Bluetooth: Fix establishing ESCO links

Commit 4cd2d98340b4f03d5532c30fdaeb451b035429cb "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 <[email protected]>
---
net/bluetooth/hci_conn.c | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/net/bluetooth/hci_conn.c b/net/bluetooth/hci_conn.c
index 98670b1..3e65c02 100644
--- a/net/bluetooth/hci_conn.c
+++ b/net/bluetooth/hci_conn.c
@@ -521,8 +521,8 @@ static struct hci_conn *hci_connect_acl(struct hci_dev *hdev, bdaddr_t *dst,
return acl;
}

-static struct hci_conn *hci_connect_sco(struct hci_dev *hdev, bdaddr_t *dst,
- u8 sec_level, u8 auth_type)
+static struct hci_conn *hci_connect_sco(struct hci_dev *hdev, int type,
+ bdaddr_t *dst, u8 sec_level, u8 auth_type)
{
struct hci_conn *acl;
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))
return acl;

- sco = hci_conn_hash_lookup_ba(hdev, SCO_LINK, dst);
+ sco = hci_conn_hash_lookup_ba(hdev, type, dst);
if (!sco) {
- sco = hci_conn_add(hdev, SCO_LINK, dst);
+ sco = hci_conn_add(hdev, type, dst);
if (!sco) {
hci_conn_put(acl);
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:
return hci_connect_acl(hdev, dst, sec_level, auth_type);
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);
--
1.7.11.4

2012-08-21 17:38:48

by Gustavo Padovan

Subject: Re: [PATCH] Bluetooth: Fix establishing ESCO links

Hi Vinicius,

* Vinicius Costa Gomes <[email protected]> [2012-08-17 21:37:59 -0300]:

> Commit 4cd2d98340b4f03d5532c30fdaeb451b035429cb "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 <[email protected]>
> ---
> net/bluetooth/hci_conn.c | 11 ++++++-----
> 1 file changed, 6 insertions(+), 5 deletions(-)

Patch has been applied to bluetooth-next. Thanks.

Gustavo