[PATCHv3 11/18] Bluetooth: Add move confirm response handling
From: Mat Martineau <hidden>
Date: 2012-10-18 17:58:43
Subsystem:
bluetooth subsystem, the rest · Maintainers:
Marcel Holtmann, Luiz Augusto von Dentz, Linus Torvalds
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 <redacted> 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