From: Mat Martineau <mathewm@codeaurora.org>
To: linux-bluetooth@vger.kernel.org, gustavo@padovan.org
Cc: sunnyk@codeaurora.org, marcel@holtmann.org,
andrei.emeltchenko.news@gmail.com
Subject: [PATCHv5 14/18] Bluetooth: Do not send data during channel move
Date: Tue, 23 Oct 2012 15:24:19 -0700 [thread overview]
Message-ID: <1351031063-11791-15-git-send-email-mathewm@codeaurora.org> (raw)
In-Reply-To: <1351031063-11791-1-git-send-email-mathewm@codeaurora.org>
Outgoing ERTM data is queued during a channel move. The ERTM state
machine is partially reset at the start of a move, and must be
resynchronized with the remote state machine at the end of the move.
Data is not sent so that there are no state transitions between the
partial reset and the resync.
Streaming mode frames are dropped during a move.
Signed-off-by: Mat Martineau <mathewm@codeaurora.org>
Acked-by: Marcel Holtmann <marcel@holtmann.org>
Acked-by: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
---
net/bluetooth/l2cap_core.c | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c
index 22f3768..4eb3ca8 100644
--- a/net/bluetooth/l2cap_core.c
+++ b/net/bluetooth/l2cap_core.c
@@ -947,6 +947,9 @@ static void l2cap_send_sframe(struct l2cap_chan *chan,
if (!control->sframe)
return;
+ if (__chan_is_moving(chan))
+ return;
+
if (test_and_clear_bit(CONN_SEND_FBIT, &chan->conn_state) &&
!control->poll)
control->final = 1;
@@ -1811,6 +1814,9 @@ static void l2cap_streaming_send(struct l2cap_chan *chan,
BT_DBG("chan %p, skbs %p", chan, skbs);
+ if (__chan_is_moving(chan))
+ return;
+
skb_queue_splice_tail_init(skbs, &chan->tx_q);
while (!skb_queue_empty(&chan->tx_q)) {
@@ -1853,6 +1859,9 @@ static int l2cap_ertm_send(struct l2cap_chan *chan)
if (test_bit(CONN_REMOTE_BUSY, &chan->conn_state))
return 0;
+ if (__chan_is_moving(chan))
+ return 0;
+
while (chan->tx_send_head &&
chan->unacked_frames < chan->remote_tx_win &&
chan->tx_state == L2CAP_TX_STATE_XMIT) {
@@ -1918,6 +1927,9 @@ static void l2cap_ertm_resend(struct l2cap_chan *chan)
if (test_bit(CONN_REMOTE_BUSY, &chan->conn_state))
return;
+ if (__chan_is_moving(chan))
+ return;
+
while (chan->retrans_list.head != L2CAP_SEQ_LIST_CLEAR) {
seq = l2cap_seq_list_pop(&chan->retrans_list);
--
1.8.0
--
Mat Martineau
Employee of Qualcomm Innovation Center, Inc.
The Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation
next prev parent reply other threads:[~2012-10-23 22:24 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-10-23 22:24 [PATCHv5 00/18] L2CAP signaling for AMP channel create/move Mat Martineau
2012-10-23 22:24 ` [PATCHv5 01/18] Bluetooth: Add new l2cap_chan struct members for high speed channels Mat Martineau
2012-10-23 22:24 ` [PATCHv5 02/18] Bluetooth: Add L2CAP create channel request handling Mat Martineau
2012-10-23 22:24 ` [PATCHv5 03/18] Bluetooth: Remove unnecessary intermediate function Mat Martineau
2012-10-23 22:24 ` [PATCHv5 04/18] Bluetooth: Lookup channel structure based on DCID Mat Martineau
2012-10-23 22:24 ` [PATCHv5 05/18] Bluetooth: Channel move request handling Mat Martineau
2012-10-23 22:24 ` [PATCHv5 06/18] Bluetooth: Add new ERTM receive states for channel move Mat Martineau
2012-10-23 22:24 ` [PATCHv5 07/18] Bluetooth: Add move channel confirm handling Mat Martineau
2012-10-23 22:24 ` [PATCHv5 08/18] Bluetooth: Add state to hci_chan Mat Martineau
2012-10-23 22:24 ` [PATCHv5 09/18] Bluetooth: Move channel response Mat Martineau
2012-10-23 22:24 ` [PATCHv5 10/18] Bluetooth: Add logical link confirm Mat Martineau
2012-10-23 22:36 ` Marcel Holtmann
2012-10-23 22:24 ` [PATCHv5 11/18] Bluetooth: Add move confirm response handling Mat Martineau
2012-10-23 22:24 ` [PATCHv5 12/18] Bluetooth: Handle physical link completion Mat Martineau
2012-10-23 22:24 ` [PATCHv5 13/18] Bluetooth: Flag ACL frames as complete for AMP controllers Mat Martineau
2012-10-23 22:24 ` Mat Martineau [this message]
2012-10-23 22:24 ` [PATCHv5 15/18] Bluetooth: Configure appropriate timeouts " Mat Martineau
2012-10-23 22:24 ` [PATCHv5 16/18] Bluetooth: Ignore BR/EDR packet size constraints when fragmenting for AMP Mat Martineau
2012-10-23 22:24 ` [PATCHv5 17/18] Bluetooth: Do not retransmit data during a channel move Mat Martineau
2012-10-23 22:24 ` [PATCHv5 18/18] Bluetooth: Start channel move when socket option is changed Mat Martineau
2012-10-24 2:45 ` Gustavo Padovan
2012-10-23 22:38 ` [PATCHv5 00/18] L2CAP signaling for AMP channel create/move Marcel Holtmann
2012-10-24 4:58 ` Andrei Emeltchenko
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1351031063-11791-15-git-send-email-mathewm@codeaurora.org \
--to=mathewm@codeaurora.org \
--cc=andrei.emeltchenko.news@gmail.com \
--cc=gustavo@padovan.org \
--cc=linux-bluetooth@vger.kernel.org \
--cc=marcel@holtmann.org \
--cc=sunnyk@codeaurora.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).