Hi Luiz,
On Tue, 2017-04-11 at 22:21 +0300, Luiz Augusto von Dentz wrote:
> From: Luiz Augusto von Dentz <luiz.von.dentz@xxxxxxxxx>
>
> 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: Luiz Augusto von Dentz <luiz.von.dentz@xxxxxxxxx>
> ---
> net/bluetooth/l2cap_core.c | 27 +++++++++++++++++++--------
> 1 file changed, 19 insertions(+), 8 deletions(-)
>
> diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c
> index 3a202b0..f88ac995 100644
> --- a/net/bluetooth/l2cap_core.c
> +++ b/net/bluetooth/l2cap_core.c
> @@ -2425,6 +2425,22 @@ static int l2cap_segment_le_sdu(struct
> l2cap_chan *chan,
> 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)
> {
> 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);
>
> - while (chan->tx_credits && !skb_queue_empty(&chan-
> >tx_q)) {
> - l2cap_do_send(chan, skb_dequeue(&chan-
> >tx_q));
> - chan->tx_credits--;
> - }
> + l2cap_le_flowctl_send(chan);
>
> if (!chan->tx_credits)
> chan->ops->suspend(chan);
> @@ -5567,10 +5580,8 @@ static inline int l2cap_le_credits(struct
> l2cap_conn *conn,
>
> chan->tx_credits += credits;
>
> - while (chan->tx_credits && !skb_queue_empty(&chan->tx_q)) {
> - l2cap_do_send(chan, skb_dequeue(&chan->tx_q));
> - chan->tx_credits--;
> - }
> + /* Resume sending */
> + l2cap_le_flowctl_send(chan);
>
> if (chan->tx_credits)
> chan->ops->resume(chan);
Acked-by: Jukka Rissanen <jukka.rissanen@xxxxxxxxxxxxxxx>
Cheers,
Jukka
--
To unsubscribe from this list: send the line "unsubscribe linux-wpan" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
