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

Commit 63d2bc1b authored by Andrei Emeltchenko's avatar Andrei Emeltchenko Committed by Johan Hedberg
Browse files

Bluetooth: Helper removes duplicated code 



Use __check_timout helper to remove duplicated code

Signed-off-by: default avatarAndrei Emeltchenko <andrei.emeltchenko@intel.com>
Reviewed-by: default avatarUlisses Furquim <ulisses@profusion.mobi>
Acked-by: default avatarMarcel Holtmann <marcel@holtmann.org>
Signed-off-by: default avatarJohan Hedberg <johan.hedberg@intel.com>
parent b71d385a

net/bluetooth/hci_core.c

+13 −18
Original line number Diff line number Diff line
@@ -2390,22 +2390,25 @@ static inline int __get_blocks(struct hci_dev *hdev, struct sk_buff *skb) 
	return DIV_ROUND_UP(skb->len - HCI_ACL_HDR_SIZE, hdev->block_len);

}



static inline void hci_sched_acl_pkt(struct hci_dev *hdev)

static inline void __check_timeout(struct hci_dev *hdev, unsigned int cnt)

{

	struct hci_chan *chan;

	struct sk_buff *skb;

	int quote;

	unsigned int cnt;



	if (!test_bit(HCI_RAW, &hdev->flags)) {

		/* ACL tx timeout must be longer than maximum

		 * link supervision timeout (40.9 seconds) */

		if (!hdev->acl_cnt && time_after(jiffies, hdev->acl_last_tx +

		if (!cnt && time_after(jiffies, hdev->acl_last_tx +

					msecs_to_jiffies(HCI_ACL_TX_TIMEOUT)))

			hci_link_tx_to(hdev, ACL_LINK);

	}

}



	cnt = hdev->acl_cnt;

static inline void hci_sched_acl_pkt(struct hci_dev *hdev)

{

	unsigned int cnt = hdev->acl_cnt;

	struct hci_chan *chan;

	struct sk_buff *skb;

	int quote;



	__check_timeout(hdev, cnt);



	while (hdev->acl_cnt &&

			(chan = hci_chan_sent(hdev, ACL_LINK, &quote))) {
@@ -2438,20 +2441,12 @@ static inline void hci_sched_acl_pkt(struct hci_dev *hdev) 


static inline void hci_sched_acl_blk(struct hci_dev *hdev)

{

	unsigned int cnt = hdev->block_cnt;

	struct hci_chan *chan;

	struct sk_buff *skb;

	int quote;

	unsigned int cnt;



	if (!test_bit(HCI_RAW, &hdev->flags)) {

		/* ACL tx timeout must be longer than maximum

		 * link supervision timeout (40.9 seconds) */

		if (!hdev->block_cnt && time_after(jiffies, hdev->acl_last_tx +

					msecs_to_jiffies(HCI_ACL_TX_TIMEOUT)))

			hci_link_tx_to(hdev, ACL_LINK);

	}



	cnt = hdev->block_cnt;

	__check_timeout(hdev, cnt);



	while (hdev->block_cnt > 0 &&

			(chan = hci_chan_sent(hdev, ACL_LINK, &quote))) {