From: Mat Martineau <mathewm@codeaurora.org>
To: linux-bluetooth@vger.kernel.org, gustavo@padovan.org
Cc: sunnyk@codeaurora.org, marcel@holtmann.org
Subject: [PATCH 07/19] Bluetooth: Add move channel confirm handling
Date: Mon, 15 Oct 2012 08:33:56 -0700 [thread overview]
Message-ID: <1350315248-7690-8-git-send-email-mathewm@codeaurora.org> (raw)
In-Reply-To: <1350315248-7690-1-git-send-email-mathewm@codeaurora.org>
After sending a move channel response, a move responder waits for a
move channel confirm command. If the received command has a
"confirmed" result the move is proceeding, and "unconfirmed" means the
move has failed and the channel will not change controllers.
Signed-off-by: Mat Martineau <mathewm@codeaurora.org>
---
net/bluetooth/l2cap_core.c | 70 ++++++++++++++++++++++++++++++++++++++++++++--
1 file changed, 67 insertions(+), 3 deletions(-)
diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c
index aab7f79..ef744a9 100644
--- a/net/bluetooth/l2cap_core.c
+++ b/net/bluetooth/l2cap_core.c
@@ -1030,6 +1030,42 @@ static void l2cap_move_setup(struct l2cap_chan *chan)
set_bit(CONN_REMOTE_BUSY, &chan->conn_state);
}
+static void l2cap_move_success(struct l2cap_chan *chan)
+{
+ BT_DBG("chan %p", chan);
+
+ if (chan->mode != L2CAP_MODE_ERTM)
+ return;
+
+ switch (chan->move_role) {
+ case L2CAP_MOVE_ROLE_INITIATOR:
+ l2cap_tx(chan, NULL, NULL, L2CAP_EV_EXPLICIT_POLL);
+ chan->rx_state = L2CAP_RX_STATE_WAIT_F;
+ break;
+ case L2CAP_MOVE_ROLE_RESPONDER:
+ chan->rx_state = L2CAP_RX_STATE_WAIT_P;
+ break;
+ }
+}
+
+static void l2cap_move_revert(struct l2cap_chan *chan)
+{
+ BT_DBG("chan %p", chan);
+
+ if (chan->mode != L2CAP_MODE_ERTM)
+ return;
+
+ switch (chan->move_role) {
+ case L2CAP_MOVE_ROLE_INITIATOR:
+ l2cap_tx(chan, NULL, NULL, L2CAP_EV_EXPLICIT_POLL);
+ chan->rx_state = L2CAP_RX_STATE_WAIT_F;
+ break;
+ case L2CAP_MOVE_ROLE_RESPONDER:
+ chan->rx_state = L2CAP_RX_STATE_WAIT_P;
+ break;
+ }
+}
+
static void l2cap_chan_ready(struct l2cap_chan *chan)
{
/* This clears all conf flags, including CONF_NOT_COMPLETE */
@@ -4297,11 +4333,12 @@ static inline int l2cap_move_channel_rsp(struct l2cap_conn *conn,
return 0;
}
-static inline int l2cap_move_channel_confirm(struct l2cap_conn *conn,
- struct l2cap_cmd_hdr *cmd,
- u16 cmd_len, void *data)
+static int l2cap_move_channel_confirm(struct l2cap_conn *conn,
+ struct l2cap_cmd_hdr *cmd,
+ u16 cmd_len, void *data)
{
struct l2cap_move_chan_cfm *cfm = data;
+ struct l2cap_chan *chan;
u16 icid, result;
if (cmd_len != sizeof(*cfm))
@@ -4312,8 +4349,35 @@ static inline int l2cap_move_channel_confirm(struct l2cap_conn *conn,
BT_DBG("icid 0x%4.4x, result 0x%4.4x", icid, result);
+ chan = l2cap_get_chan_by_dcid(conn, icid);
+ if (!chan)
+ goto send_move_confirm_response;
+
+ if (chan->move_state == L2CAP_MOVE_WAIT_CONFIRM) {
+ chan->move_state = L2CAP_MOVE_STABLE;
+ if (result == L2CAP_MC_CONFIRMED) {
+ chan->local_amp_id = chan->move_id;
+ if (!chan->local_amp_id) {
+ /* 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);
+ } else {
+ chan->move_id = chan->local_amp_id;
+ l2cap_move_revert(chan);
+ }
+ chan->move_role = L2CAP_MOVE_ROLE_NONE;
+ }
+
+send_move_confirm_response:
l2cap_send_move_chan_cfm_rsp(conn, cmd->ident, icid);
+ if (chan)
+ 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
next prev parent reply other threads:[~2012-10-15 15:33 UTC|newest]
Thread overview: 45+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-10-15 15:33 [PATCH 00/19] L2CAP signaling for AMP channel create/move Mat Martineau
2012-10-15 15:33 ` [PATCH 01/19] Bluetooth: Add new l2cap_chan struct members for high speed channels Mat Martineau
2012-10-15 15:33 ` [PATCH 02/19] Bluetooth: Add L2CAP create channel request handling Mat Martineau
2012-10-15 15:33 ` [PATCH 03/19] Bluetooth: Remove unnecessary intermediate function Mat Martineau
2012-10-15 18:10 ` Marcel Holtmann
2012-10-15 15:33 ` [PATCH 04/19] Bluetooth: Lookup channel structure based on DCID Mat Martineau
2012-10-15 18:13 ` Marcel Holtmann
2012-10-15 15:33 ` [PATCH 05/19] Bluetooth: Channel move request handling Mat Martineau
2012-10-15 18:17 ` Marcel Holtmann
2012-10-16 10:18 ` Andrei Emeltchenko
2012-10-15 15:33 ` [PATCH 06/19] Bluetooth: Add new ERTM receive states for channel move Mat Martineau
2012-10-15 18:23 ` Marcel Holtmann
2012-10-16 10:21 ` Andrei Emeltchenko
2012-10-15 15:33 ` Mat Martineau [this message]
2012-10-15 18:25 ` [PATCH 07/19] Bluetooth: Add move channel confirm handling Marcel Holtmann
2012-10-16 17:30 ` Mat Martineau
2012-10-17 17:10 ` Marcel Holtmann
2012-10-16 10:27 ` Andrei Emeltchenko
2012-10-16 23:00 ` Mat Martineau
2012-10-15 15:33 ` [PATCH 08/19] Bluetooth: Add state to hci_chan Mat Martineau
2012-10-15 18:26 ` Marcel Holtmann
2012-10-15 15:33 ` [PATCH 09/19] Bluetooth: Move channel response Mat Martineau
2012-10-15 18:29 ` Marcel Holtmann
2012-10-16 17:56 ` Mat Martineau
2012-10-15 15:33 ` [PATCH 10/19] Bluetooth: Add logical link confirm Mat Martineau
2012-10-15 18:37 ` Marcel Holtmann
2012-10-16 10:38 ` Andrei Emeltchenko
2012-10-16 22:25 ` Mat Martineau
2012-10-15 15:34 ` [PATCH 11/19] Bluetooth: Add move confirm response handling Mat Martineau
2012-10-15 18:38 ` Marcel Holtmann
2012-10-15 15:34 ` [PATCH 12/19] Bluetooth: Handle physical link completion Mat Martineau
2012-10-15 18:40 ` Marcel Holtmann
2012-10-15 15:34 ` [PATCH 13/19] Bluetooth: Flag ACL frames as complete for AMP controllers Mat Martineau
2012-10-15 18:41 ` Marcel Holtmann
2012-10-15 15:34 ` [PATCH 14/19] Bluetooth: Do not send data during channel move Mat Martineau
2012-10-15 18:42 ` Marcel Holtmann
2012-10-16 10:50 ` Andrei Emeltchenko
2012-10-15 15:34 ` [PATCH 15/19] Bluetooth: Configure appropriate timeouts for AMP controllers Mat Martineau
2012-10-15 18:44 ` Marcel Holtmann
2012-10-15 15:34 ` [PATCH 16/19] Bluetooth: Ignore BR/EDR packet size constraints when fragmenting for AMP Mat Martineau
2012-10-15 15:34 ` [PATCH 17/19] Bluetooth: Send create channel request instead of connect " Mat Martineau
2012-10-15 15:34 ` [PATCH 18/19] Bluetooth: Do not retransmit data during a channel move Mat Martineau
2012-10-15 18:46 ` Marcel Holtmann
2012-10-15 15:34 ` [PATCH 19/19] Bluetooth: Start channel move when socket option is changed Mat Martineau
2012-10-15 18:47 ` Marcel Holtmann
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=1350315248-7690-8-git-send-email-mathewm@codeaurora.org \
--to=mathewm@codeaurora.org \
--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).