summaryrefslogtreecommitdiff
path: root/net/bluetooth
diff options
context:
space:
mode:
authorMat Martineau <mathewm@codeaurora.org>2012-05-14 11:24:33 -0700
committerGustavo Padovan <gustavo@padovan.org>2012-05-14 16:32:11 -0300
commit577cfaeb864874011386a05ab4f5580a6a2aeb11 (patch)
tree8b1c3b8f751c4f8cf0066890d587c518a11f05c2 /net/bluetooth
parent53168e5b3b40efffff8b9f2e6e0eaf5607daa884 (diff)
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>
Diffstat (limited to 'net/bluetooth')
-rw-r--r--net/bluetooth/l2cap_core.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c
index 2b30bd767779..869beb30f480 100644
--- 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