Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d90aa682 authored by Marcel Holtmann's avatar Marcel Holtmann
Browse files

Bluetooth: hci_uart: Use h4_recv_buf helper for Atheros AR300x 



Instead of using hci_recv_stream_fragment, use the local available
h4_recv_buf helper function.

To ensure that the function is available select BT_HCIUART_H4.

Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
Signed-off-by: default avatarJohan Hedberg <johan.hedberg@intel.com>
parent c27799f9

drivers/bluetooth/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -62,6 +62,7 @@ config BT_HCIUART_BCSP 
config BT_HCIUART_ATH3K

	bool "Atheros AR300x serial support"

	depends on BT_HCIUART

	select BT_HCIUART_H4

	help

	  HCIATH3K (HCI Atheros AR300x) is a serial protocol for

	  communication between host and Atheros AR300x Bluetooth devices.

drivers/bluetooth/hci_ath.c

+9 −5
Original line number Diff line number Diff line
@@ -45,6 +45,7 @@ struct ath_struct { 
	struct hci_uart *hu;

	unsigned int cur_sleep;



	struct sk_buff *rx_skb;

	struct sk_buff_head txq;

	struct work_struct ctxtsw;

};
@@ -136,6 +137,8 @@ static int ath_close(struct hci_uart *hu) 


	skb_queue_purge(&ath->txq);



	kfree_skb(ath->rx_skb);



	cancel_work_sync(&ath->ctxtsw);



	hu->priv = NULL;
@@ -190,12 +193,13 @@ static struct sk_buff *ath_dequeue(struct hci_uart *hu) 
/* Recv data */

static int ath_recv(struct hci_uart *hu, const void *data, int count)

{

	int ret;

	struct ath_struct *ath = hu->priv;



	ret = hci_recv_stream_fragment(hu->hdev, data, count);

	if (ret < 0) {

		BT_ERR("Frame Reassembly Failed");

		return ret;

	ath->rx_skb = h4_recv_buf(hu->hdev, ath->rx_skb, data, count);

	if (IS_ERR(ath->rx_skb)) {

		int err = PTR_ERR(ath->rx_skb);

		BT_ERR("%s: Frame reassembly failed (%d)", hu->hdev->name, err);

		return err;

	}



	return count;