From: Luiz Augusto von Dentz <luiz.dentz@gmail.com>
To: linux-bluetooth@vger.kernel.org
Subject: [PATCH 10/10] Bluetooth: btusb: Detect if an ACL packet is in fact an ISO packet
Date: Mon, 6 Jan 2020 23:40:56 -0800 [thread overview]
Message-ID: <20200107074056.25453-11-luiz.dentz@gmail.com> (raw)
In-Reply-To: <20200107074056.25453-1-luiz.dentz@gmail.com>
From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
Fix up the packet type if ISO packets are sent over the bulk endpoint.
Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
---
drivers/bluetooth/btusb.c | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c
index ded0ba83bcce..c1e030fc272f 100644
--- a/drivers/bluetooth/btusb.c
+++ b/drivers/bluetooth/btusb.c
@@ -663,11 +663,18 @@ static int btusb_recv_bulk(struct btusb_data *data, void *buffer, int count)
hci_skb_expect(skb) -= len;
if (skb->len == HCI_ACL_HDR_SIZE) {
+ __u16 handle = __le16_to_cpu(hci_acl_hdr(skb)->handle);
__le16 dlen = hci_acl_hdr(skb)->dlen;
+ __u8 type;
/* Complete ACL header */
hci_skb_expect(skb) = __le16_to_cpu(dlen);
+ type = hci_conn_lookup_type(data->hdev,
+ hci_handle(handle));
+ if (type == ISO_LINK)
+ hci_skb_pkt_type(skb) = HCI_ISODATA_PKT;
+
if (skb_tailroom(skb) < hci_skb_expect(skb)) {
kfree_skb(skb);
skb = NULL;
--
2.21.0
next prev parent reply other threads:[~2020-01-07 7:41 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-07 7:40 [PATCH 00/10] Bluetooth 5.2 initial support Luiz Augusto von Dentz
2020-01-07 7:40 ` [PATCH 01/10] Bluetooth: Add definitions for CIS connections Luiz Augusto von Dentz
2020-01-07 7:40 ` [PATCH 02/10] Bluetooth: Add initial implementation of " Luiz Augusto von Dentz
2020-01-07 20:22 ` kbuild test robot
2020-01-07 21:25 ` kbuild test robot
2020-01-07 7:40 ` [PATCH 03/10] Bluetooth: L2CAP: Add definitions for Enhanced Credit Based Mode Luiz Augusto von Dentz
2020-01-08 21:28 ` Marcel Holtmann
2020-01-07 7:40 ` [PATCH 04/10] Bluetooth: L2CAP: Add initial code " Luiz Augusto von Dentz
2020-01-07 7:40 ` [PATCH 05/10] Bluetooth: hci_vhci: Add support for ISO packets Luiz Augusto von Dentz
2020-01-07 7:40 ` [PATCH 06/10] Bluetooth: monitor: " Luiz Augusto von Dentz
2020-01-07 7:40 ` [PATCH 07/10] Bluetooth: Make use of __check_timeout on hci_sched_le Luiz Augusto von Dentz
2020-01-07 7:40 ` [PATCH 08/10] Bluetooth: hci_h4: Add support for ISO packets Luiz Augusto von Dentz
2020-01-08 21:23 ` Marcel Holtmann
2020-01-08 21:47 ` Luiz Augusto von Dentz
2020-01-07 7:40 ` [PATCH 09/10] Bluetooth: btusb: " Luiz Augusto von Dentz
2020-01-08 21:22 ` Marcel Holtmann
2020-01-08 21:57 ` Luiz Augusto von Dentz
2020-01-07 7:40 ` Luiz Augusto von Dentz [this message]
2020-01-08 21:25 ` [PATCH 10/10] Bluetooth: btusb: Detect if an ACL packet is in fact an ISO packet Marcel Holtmann
2020-01-08 21:45 ` Luiz Augusto von Dentz
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200107074056.25453-11-luiz.dentz@gmail.com \
--to=luiz.dentz@gmail.com \
--cc=linux-bluetooth@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).