linux-bluetooth.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
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: [PATCHv3 11/18] Bluetooth: Add move confirm response handling
Date: Thu, 18 Oct 2012 10:58:43 -0700	[thread overview]
Message-ID: <1350583130-3241-12-git-send-email-mathewm@codeaurora.org> (raw)
In-Reply-To: <1350583130-3241-1-git-send-email-mathewm@codeaurora.org>

The move confirm response concludes the channel move command sequence.
Receipt of this command indicates that data may begin to flow again.

Signed-off-by: Mat Martineau <mathewm@codeaurora.org>
Acked-by: Marcel Holtmann <marcel@holtmann.org>
---
 net/bluetooth/l2cap_core.c | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c
index 8e50685..f315530 100644
--- a/net/bluetooth/l2cap_core.c
+++ b/net/bluetooth/l2cap_core.c
@@ -4661,6 +4661,7 @@ static inline int l2cap_move_channel_confirm_rsp(struct l2cap_conn *conn,
 						 u16 cmd_len, void *data)
 {
 	struct l2cap_move_chan_cfm_rsp *rsp = data;
+	struct l2cap_chan *chan;
 	u16 icid;
 
 	if (cmd_len != sizeof(*rsp))
@@ -4670,6 +4671,31 @@ static inline int l2cap_move_channel_confirm_rsp(struct l2cap_conn *conn,
 
 	BT_DBG("icid 0x%4.4x", icid);
 
+	chan = l2cap_get_chan_by_scid(conn, icid);
+	if (!chan)
+		return 0;
+
+	__clear_chan_timer(chan);
+
+	if (chan->move_state == L2CAP_MOVE_WAIT_CONFIRM_RSP) {
+		chan->move_state = L2CAP_MOVE_STABLE;
+		chan->local_amp_id = chan->move_id;
+
+		if (!chan->local_amp_id && chan->hs_hchan) {
+			/* Have moved off of AMP, free the channel */
+			chan->hs_hchan = NULL;
+			chan->hs_hcon = NULL;
+
+			/* Placeholder - free the logical link */
+		}
+
+		l2cap_move_success(chan);
+
+		chan->move_role = L2CAP_MOVE_ROLE_NONE;
+	}
+
+	l2cap_chan_unlock(chan);
+
 	return 0;
 }
 
-- 
1.7.12.3

--
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

  parent reply	other threads:[~2012-10-18 17:58 UTC|newest]

Thread overview: 38+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-10-18 17:58 [PATCHv3 00/18] L2CAP signaling for AMP channel create/move Mat Martineau
2012-10-18 17:58 ` [PATCHv3 01/18] Bluetooth: Add new l2cap_chan struct members for high speed channels Mat Martineau
2012-10-18 17:58 ` [PATCHv3 02/18] Bluetooth: Add L2CAP create channel request handling Mat Martineau
2012-10-18 17:58 ` [PATCHv3 03/18] Bluetooth: Remove unnecessary intermediate function Mat Martineau
2012-10-19  7:56   ` Andrei Emeltchenko
2012-10-18 17:58 ` [PATCHv3 04/18] Bluetooth: Lookup channel structure based on DCID Mat Martineau
2012-10-19  7:57   ` Andrei Emeltchenko
2012-10-18 17:58 ` [PATCHv3 05/18] Bluetooth: Channel move request handling Mat Martineau
2012-10-19  8:00   ` Andrei Emeltchenko
2012-10-18 17:58 ` [PATCHv3 06/18] Bluetooth: Add new ERTM receive states for channel move Mat Martineau
2012-10-19  8:06   ` Andrei Emeltchenko
2012-10-18 17:58 ` [PATCHv3 07/18] Bluetooth: Add move channel confirm handling Mat Martineau
2012-10-18 21:03   ` Marcel Holtmann
2012-10-19  8:07   ` Andrei Emeltchenko
2012-10-18 17:58 ` [PATCHv3 08/18] Bluetooth: Add state to hci_chan Mat Martineau
2012-10-19  8:08   ` Andrei Emeltchenko
2012-10-18 17:58 ` [PATCHv3 09/18] Bluetooth: Move channel response Mat Martineau
2012-10-18 21:05   ` Marcel Holtmann
2012-10-18 17:58 ` [PATCHv3 10/18] Bluetooth: Add logical link confirm Mat Martineau
2012-10-18 21:08   ` Marcel Holtmann
2012-10-19 21:21     ` Mat Martineau
2012-10-19  7:53   ` Andrei Emeltchenko
2012-10-19 16:44     ` Mat Martineau
2012-10-18 17:58 ` Mat Martineau [this message]
2012-10-19  8:25   ` [PATCHv3 11/18] Bluetooth: Add move confirm response handling Andrei Emeltchenko
2012-10-18 17:58 ` [PATCHv3 12/18] Bluetooth: Handle physical link completion Mat Martineau
2012-10-19  8:32   ` Andrei Emeltchenko
2012-10-18 17:58 ` [PATCHv3 13/18] Bluetooth: Flag ACL frames as complete for AMP controllers Mat Martineau
2012-10-19  8:44   ` Andrei Emeltchenko
2012-10-18 17:58 ` [PATCHv3 14/18] Bluetooth: Do not send data during channel move Mat Martineau
2012-10-19  8:45   ` Andrei Emeltchenko
2012-10-18 17:58 ` [PATCHv3 15/18] Bluetooth: Configure appropriate timeouts for AMP controllers Mat Martineau
2012-10-18 17:58 ` [PATCHv3 16/18] Bluetooth: Ignore BR/EDR packet size constraints when fragmenting for AMP Mat Martineau
2012-10-18 17:58 ` [PATCHv3 17/18] Bluetooth: Do not retransmit data during a channel move Mat Martineau
2012-10-19  8:48   ` Andrei Emeltchenko
2012-10-18 17:58 ` [PATCHv3 18/18] Bluetooth: Start channel move when socket option is changed Mat Martineau
2012-10-19  9:37   ` Andrei Emeltchenko
2012-10-19 16:16     ` Mat Martineau

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=1350583130-3241-12-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).