2011-03-14 21:20:33

by Vinicius Costa Gomes

[permalink] [raw]
Subject: [bluetooth-next] Bluetooth: fix sending LE data over USB

Now that we have support for LE connections, before discarding a
frame we must check if there's a LE connection over that transport.

Signed-off-by: Vinicius Costa Gomes <[email protected]>
---
drivers/bluetooth/btusb.c | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c
index 411ae9c..59dd4ae 100644
--- a/drivers/bluetooth/btusb.c
+++ b/drivers/bluetooth/btusb.c
@@ -690,7 +690,8 @@ static int btusb_send_frame(struct sk_buff *skb)
break;

case HCI_ACLDATA_PKT:
- if (!data->bulk_tx_ep || hdev->conn_hash.acl_num < 1)
+ if (!data->bulk_tx_ep || (hdev->conn_hash.acl_num < 1 &&
+ hdev->conn_hash.le_num < 1))
return -ENODEV;

urb = usb_alloc_urb(0, GFP_ATOMIC);
--
1.7.4.1



2011-03-16 20:45:35

by Gustavo Padovan

[permalink] [raw]
Subject: Re: [bluetooth-next] Bluetooth: fix sending LE data over USB

Hi Vinicius,

* Vinicius Costa Gomes <[email protected]> [2011-03-14 18:20:33 -0300]:

> Now that we have support for LE connections, before discarding a
> frame we must check if there's a LE connection over that transport.
>
> Signed-off-by: Vinicius Costa Gomes <[email protected]>
> ---
> drivers/bluetooth/btusb.c | 3 ++-
> 1 files changed, 2 insertions(+), 1 deletions(-)

Applied, thanks.

--
Gustavo F. Padovan
http://profusion.mobi

2011-03-15 10:38:09

by Ville Tervo

[permalink] [raw]
Subject: Re: [bluetooth-next] Bluetooth: fix sending LE data over USB

Hi Vinicius,

On Mon, Mar 14, 2011 at 06:20:33PM -0300, ext Vinicius Costa Gomes wrote:
> Now that we have support for LE connections, before discarding a
> frame we must check if there's a LE connection over that transport.
>
> Signed-off-by: Vinicius Costa Gomes <[email protected]>

Looks ok.

Acked-by: Ville Tervo <[email protected]>


> ---
> drivers/bluetooth/btusb.c | 3 ++-
> 1 files changed, 2 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c
> index 411ae9c..59dd4ae 100644
> --- a/drivers/bluetooth/btusb.c
> +++ b/drivers/bluetooth/btusb.c
> @@ -690,7 +690,8 @@ static int btusb_send_frame(struct sk_buff *skb)
> break;
>
> case HCI_ACLDATA_PKT:
> - if (!data->bulk_tx_ep || hdev->conn_hash.acl_num < 1)
> + if (!data->bulk_tx_ep || (hdev->conn_hash.acl_num < 1 &&
> + hdev->conn_hash.le_num < 1))
> return -ENODEV;
>
> urb = usb_alloc_urb(0, GFP_ATOMIC);
> --
> 1.7.4.1
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-bluetooth" in
> the body of a message to [email protected]
> More majordomo info at http://vger.kernel.org/majordomo-info.html