Commit c27799f9 authored by Marcel Holtmann's avatar Marcel Holtmann

Bluetooth: hci_uart: Use h4_recv_buf helper for H:4 protocol

Instead of using hci_recv_stream_fragment, use the local available
h4_recv_buf helper function.
Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
Signed-off-by: default avatarJohan Hedberg <johan.hedberg@intel.com>
parent e1a38d70
...@@ -49,6 +49,7 @@ ...@@ -49,6 +49,7 @@
#define VERSION "1.2" #define VERSION "1.2"
struct h4_struct { struct h4_struct {
struct sk_buff *rx_skb;
struct sk_buff_head txq; struct sk_buff_head txq;
}; };
...@@ -92,6 +93,8 @@ static int h4_close(struct hci_uart *hu) ...@@ -92,6 +93,8 @@ static int h4_close(struct hci_uart *hu)
skb_queue_purge(&h4->txq); skb_queue_purge(&h4->txq);
kfree_skb(h4->rx_skb);
hu->priv = NULL; hu->priv = NULL;
kfree(h4); kfree(h4);
...@@ -115,15 +118,16 @@ static int h4_enqueue(struct hci_uart *hu, struct sk_buff *skb) ...@@ -115,15 +118,16 @@ static int h4_enqueue(struct hci_uart *hu, struct sk_buff *skb)
/* Recv data */ /* Recv data */
static int h4_recv(struct hci_uart *hu, const void *data, int count) static int h4_recv(struct hci_uart *hu, const void *data, int count)
{ {
int ret; struct h4_struct *h4 = hu->priv;
if (!test_bit(HCI_UART_REGISTERED, &hu->flags)) if (!test_bit(HCI_UART_REGISTERED, &hu->flags))
return -EUNATCH; return -EUNATCH;
ret = hci_recv_stream_fragment(hu->hdev, data, count); h4->rx_skb = h4_recv_buf(hu->hdev, h4->rx_skb, data, count);
if (ret < 0) { if (IS_ERR(h4->rx_skb)) {
BT_ERR("Frame Reassembly Failed"); int err = PTR_ERR(h4->rx_skb);
return ret; BT_ERR("%s: Frame reassembly failed (%d)", hu->hdev->name, err);
return err;
} }
return count; return count;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment