Hi Mat, On Mon, Oct 15, 2012 at 08:33:56AM -0700, Mat Martineau wrote: > 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@xxxxxxxxxxxxxx> > --- > 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; Not sure that all those function need to check for ERTM. Can it be done before calling them (for example in l2cap_move_channel_confirm)? Best regards Andrei Emeltchenko -- To unsubscribe from this list: send the line "unsubscribe linux-bluetooth" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html