Commit efe375b7 authored by Luiz Augusto von Dentz's avatar Luiz Augusto von Dentz
Browse files

Bluetooth: btusb: Remove detection of ISO packets over bulk 



This removes the code introduced by
14202eff as hci_recv_frame is now able
to detect ACL packets that are in fact ISO packets.

Fixes: 14202eff ("Bluetooth: btusb: Detect if an ACL packet is in fact an ISO packet")
Signed-off-by: default avatarLuiz Augusto von Dentz <luiz.von.dentz@intel.com>
parent 876e7810

drivers/bluetooth/btusb.c

+0 −10
Original line number Diff line number Diff line
@@ -1050,21 +1050,11 @@ 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);



			/* Detect if ISO packet has been sent over bulk */

			if (hci_conn_num(data->hdev, ISO_LINK)) {

				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;