Return-Path: Message-ID: <1350326230.26318.15.camel@aeonflux> Subject: Re: [PATCH 10/19] Bluetooth: Add logical link confirm From: Marcel Holtmann To: Mat Martineau Cc: linux-bluetooth@vger.kernel.org, gustavo@padovan.org, sunnyk@codeaurora.org Date: Mon, 15 Oct 2012 20:37:10 +0200 In-Reply-To: <1350315248-7690-11-git-send-email-mathewm@codeaurora.org> References: <1350315248-7690-1-git-send-email-mathewm@codeaurora.org> <1350315248-7690-11-git-send-email-mathewm@codeaurora.org> Content-Type: text/plain; charset="UTF-8" Mime-Version: 1.0 Sender: linux-bluetooth-owner@vger.kernel.org List-ID: Hi Mat, > The logical link confirm callback is executed when the AMP controller > completes its logical link setup. During a channel move, a newly > formed logical link allows a move responder to send a move channel > response. A move initiator will send a move channel confirm. A > failed logical link will end the channel move and send an appropriate > response or confirm command indicating a failure. > > If the channel is being created on an AMP controller, L2CAP > configuration is started after the logical link is set up. > > Signed-off-by: Mat Martineau > --- > net/bluetooth/l2cap_core.c | 117 ++++++++++++++++++++++++++++++++++++++++++++- > 1 file changed, 115 insertions(+), 2 deletions(-) > > diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c > index c687cc1..7e31e98 100644 > --- a/net/bluetooth/l2cap_core.c > +++ b/net/bluetooth/l2cap_core.c > @@ -3779,6 +3779,7 @@ static inline int l2cap_config_req(struct l2cap_conn *conn, > goto unlock; > } > > + chan->ident = cmd->ident; > l2cap_send_cmd(conn, cmd->ident, L2CAP_CONF_RSP, len, rsp); > chan->num_conf_rsp++; > > @@ -4221,11 +4222,123 @@ static void l2cap_send_move_chan_cfm_rsp(struct l2cap_conn *conn, u8 ident, > l2cap_send_cmd(conn, ident, L2CAP_MOVE_CHAN_CFM_RSP, sizeof(rsp), &rsp); > } > > +/* Call with chan locked */ > static void l2cap_logical_cfm(struct l2cap_chan *chan, struct hci_chan *hchan, > u8 status) > { > - /* Placeholder */ > - return; > + BT_DBG("chan %p, hchan %p, status %d", chan, hchan, status); > + > + if (chan->state != BT_CONNECTED && !chan->local_amp_id) > + return; > + > + if (!status && chan->state != BT_CONNECTED) { checking chan->state twice here is a bit ugly. > + struct l2cap_conf_rsp rsp; > + u8 code; > + > + /* Create channel complete */ > + chan->hs_hcon = hchan->conn; > + chan->hs_hcon->l2cap_data = chan->conn; > + > + code = l2cap_build_conf_rsp(chan, &rsp, > + L2CAP_CONF_SUCCESS, 0); > + l2cap_send_cmd(chan->conn, chan->ident, L2CAP_CONF_RSP, code, > + &rsp); > + set_bit(CONF_OUTPUT_DONE, &chan->conf_state); > + > + if (test_bit(CONF_INPUT_DONE, &chan->conf_state)) { > + int err = 0; > + > + set_default_fcs(chan); > + > + if (chan->mode == L2CAP_MODE_ERTM || > + chan->mode == L2CAP_MODE_STREAMING) > + err = l2cap_ertm_init(chan); > + > + if (err < 0) > + l2cap_send_disconn_req(chan->conn, chan, -err); > + else > + l2cap_chan_ready(chan); > + } > + } else if (chan && !status) { If chan is really NULL, then this would have crashed already ;) > + /* Channel move */ > + chan->hs_hcon = hchan->conn; > + chan->hs_hcon->l2cap_data = chan->conn; > + > + BT_DBG("move_state %d", chan->move_state); > + > + if (chan->state != BT_CONNECTED) > + return; And again checking chan->state ??? > + > + switch (chan->move_state) { > + case L2CAP_MOVE_WAIT_LOGICAL_COMP: > + /* Move confirm will be sent after a success > + * response is received > + */ > + chan->move_state = L2CAP_MOVE_WAIT_RSP_SUCCESS; > + break; > + case L2CAP_MOVE_WAIT_LOGICAL_CFM: > + if (test_bit(CONN_LOCAL_BUSY, &chan->conn_state)) { > + chan->move_state = L2CAP_MOVE_WAIT_LOCAL_BUSY; > + } else if (chan->move_role == > + L2CAP_MOVE_ROLE_INITIATOR) { > + chan->move_state = L2CAP_MOVE_WAIT_CONFIRM_RSP; > + l2cap_send_move_chan_cfm(chan->conn, chan, > + chan->scid, > + L2CAP_MR_SUCCESS); > + __set_chan_timer(chan, L2CAP_MOVE_TIMEOUT); > + } else if (chan->move_role == > + L2CAP_MOVE_ROLE_RESPONDER) { > + chan->move_state = L2CAP_MOVE_WAIT_CONFIRM; > + l2cap_send_move_chan_rsp(chan->conn, > + chan->ident, > + chan->dcid, > + L2CAP_MR_SUCCESS); > + } > + break; > + default: > + /* Move was not in expected state, free the channel */ > + chan->hs_hchan = NULL; > + chan->hs_hcon = NULL; > + > + /* Placeholder - free the logical link */ > + > + chan->move_state = L2CAP_MOVE_STABLE; > + } > + } else { > + /* Logical link setup failed. */ > + > + if (chan->state != BT_CONNECTED) And again ??? > + l2cap_send_disconn_req(chan->conn, chan, ECONNRESET); > + else if (chan->move_role == L2CAP_MOVE_ROLE_RESPONDER) { > + l2cap_move_revert(chan); > + chan->move_role = L2CAP_MOVE_ROLE_NONE; > + chan->move_state = L2CAP_MOVE_STABLE; > + l2cap_send_move_chan_rsp(chan->conn, chan->ident, > + chan->dcid, L2CAP_MR_NOT_SUPP); > + } else if (chan->move_role == L2CAP_MOVE_ROLE_INITIATOR) { > + if (chan->move_state == L2CAP_MOVE_WAIT_LOGICAL_COMP || > + chan->move_state == L2CAP_MOVE_WAIT_LOGICAL_CFM) { > + /* Remote has only sent pending or > + * success responses, clean up > + */ > + l2cap_move_revert(chan); > + chan->move_role = L2CAP_MOVE_ROLE_NONE; > + chan->move_state = L2CAP_MOVE_STABLE; > + } > + > + /* Other amp move states imply that the move > + * has already aborted > + */ > + l2cap_send_move_chan_cfm(chan->conn, chan, chan->scid, > + L2CAP_MC_UNCONFIRMED); > + __set_chan_timer(chan, L2CAP_MOVE_TIMEOUT); > + } > + > + chan->hs_hchan = NULL; > + chan->hs_hcon = NULL; > + > + /* Placeholder - free logical link */ > + } > } > > static inline int l2cap_move_channel_req(struct l2cap_conn *conn, Regards Marcel