---

yaml --- r: 306929 b: refs/heads/master c: 577cfae h: refs/heads/master i: 306927: 4f92d5a v: v3
git-mirror · May 14, 2012 · 0db4496 · 0db4496
1 parent 7d4ef6c
commit 0db4496
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 53168e5b3b40efffff8b9f2e6e0eaf5607daa884
+refs/heads/master: 577cfaeb864874011386a05ab4f5580a6a2aeb11
diff --git a/trunk/net/bluetooth/l2cap_core.c b/trunk/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