Commit 8a505b7f authored by Luiz Augusto von Dentz's avatar Luiz Augusto von Dentz Committed by Marcel Holtmann
Browse files

Bluetooth: L2CAP: Add l2cap_le_flowctl_send 



Consolidate code sending data to LE CoC channels and adds proper
accounting of packets sent, the remaining credits and how many packets
are queued.

Signed-off-by: default avatarLuiz Augusto von Dentz <luiz.von.dentz@intel.com>
Acked-by: default avatarJukka Rissanen <jukka.rissanen@linux.intel.com>
Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
parent f183e52b

net/bluetooth/l2cap_core.c

+19 −8
Original line number Original line Diff line number Diff line
@@ -2425,6 +2425,22 @@ static int l2cap_segment_le_sdu(struct l2cap_chan *chan, 
	return 0;

	return 0;

}

}





static void l2cap_le_flowctl_send(struct l2cap_chan *chan)

{

	int sent = 0;



	BT_DBG("chan %p", chan);



	while (chan->tx_credits && !skb_queue_empty(&chan->tx_q)) {

		l2cap_do_send(chan, skb_dequeue(&chan->tx_q));

		chan->tx_credits--;

		sent++;

	}



	BT_DBG("Sent %d credits %u queued %u", sent, chan->tx_credits,

	       skb_queue_len(&chan->tx_q));

}



int l2cap_chan_send(struct l2cap_chan *chan, struct msghdr *msg, size_t len)

int l2cap_chan_send(struct l2cap_chan *chan, struct msghdr *msg, size_t len)

{

{

	struct sk_buff *skb;

	struct sk_buff *skb;
@@ -2472,10 +2488,7 @@ int l2cap_chan_send(struct l2cap_chan *chan, struct msghdr *msg, size_t len) 




		skb_queue_splice_tail_init(&seg_queue, &chan->tx_q);

		skb_queue_splice_tail_init(&seg_queue, &chan->tx_q);





		while (chan->tx_credits && !skb_queue_empty(&chan->tx_q)) {

		l2cap_le_flowctl_send(chan);

			l2cap_do_send(chan, skb_dequeue(&chan->tx_q));

			chan->tx_credits--;

		}





		if (!chan->tx_credits)

		if (!chan->tx_credits)

			chan->ops->suspend(chan);

			chan->ops->suspend(chan);
@@ -5567,10 +5580,8 @@ static inline int l2cap_le_credits(struct l2cap_conn *conn, 




	chan->tx_credits += credits;

	chan->tx_credits += credits;





	while (chan->tx_credits && !skb_queue_empty(&chan->tx_q)) {

	/* Resume sending */

		l2cap_do_send(chan, skb_dequeue(&chan->tx_q));

	l2cap_le_flowctl_send(chan);

		chan->tx_credits--;

	}





	if (chan->tx_credits)

	if (chan->tx_credits)

		chan->ops->resume(chan);

		chan->ops->resume(chan);