From 0db44966c4f813379fce8580f914a8d28a103b68 Mon Sep 17 00:00:00 2001
From: Mat Martineau <mathewm@codeaurora.org>
Date: Mon, 14 May 2012 11:24:33 -0700
Subject: [PATCH] --- yaml --- r: 306929 b: refs/heads/master c:
 577cfaeb864874011386a05ab4f5580a6a2aeb11 h: refs/heads/master i:   306927:
 4f92d5a169eb95e9adadb7b5750cdebbfafe4ca8 v: v3

---
 [refs]                           | 2 +-
 trunk/net/bluetooth/l2cap_core.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 88a190f38db3..27503bbdaa26 100644
--- 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
index 2b30bd767779..869beb30f480 100644
--- 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