Bluetooth: Update tx_send_head when sending ERTM data

Commit 94122bbe9c8c4ad7ba9f02f9a30bfc95672c404e introduced a problem
where tx_send_head was not set to point to the first skb in the ERTM
transmit queue, which stalled data transmission.  This change sets
that pointer when transmission is not already in progress.

Reported-by: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
Signed-off-by: Mat Martineau <mathewm@codeaurora.org>
Signed-off-by: Gustavo Padovan <gustavo@padovan.org>

diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c
index 2b30bd767779c2bae6ee1fd5a9b55de39d447e09..869beb30f480e818adf7668cbb943df7b38977b2 100644 (file)
--- a/net/bluetooth/l2cap_core.c
+++ b/net/bluetooth/l2cap_core.c
@@ -2104,7 +2104,10 @@ int l2cap_chan_send(struct l2cap_chan *chan, struct msghdr *msg, size_t len,
                if (err)
                        break;
 
+               if (chan->mode == L2CAP_MODE_ERTM && chan->tx_send_head == NULL)
+                       chan->tx_send_head = seg_queue.next;
                skb_queue_splice_tail_init(&seg_queue, &chan->tx_q);
+
                if (chan->mode == L2CAP_MODE_ERTM)
                        err = l2cap_ertm_send(chan);
                else