TononixOS/ubports_kernel_google_msm
Archived
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Bluetooth: Fix channel disconnect when logical link already exists

Browse Source 
Fix issue where the attempt to move a second OBEX connection onto an
AMP link fails and the connection is disconnected.

When handling a Move when there is an existing Best Effort Logical Link
L2CAP must check for the WAIT_MOVE_CONFIRM and WAIT_MOVE_RSP_SUCESS
states when the logical link completes. In these scenarios the logical
link completes before the Move Confirm or Move Response Success is
received and L2CAP must continue to wait for the confirm or response.

CRs-fixed: 344557
Change-Id: I3e0786f780fa48592bb45ec2e81ae1ffa4a6ab80
Signed-off-by: Peter Krystad <pkrystad@codeaurora.org>
This commit is contained in:
Peter Krystad
2012-02-28 15:20:59 -08:00
committed by Stephen Boyd
parent 4f5119df8a
commit 6c2bd354d5
1 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
net/bluetooth/l2cap_core.c
View File

@@ -5037,6 +5037,10 @@ static inline int l2cap_move_channel_rsp(struct l2cap_conn *conn,
}
} else {
/* Any other amp move state means the move failed. */
pi->amp_move_id = pi->amp_id;
pi->amp_move_state = L2CAP_AMP_STATE_STABLE;
l2cap_amp_move_revert(sk);
pi->amp_move_role = L2CAP_AMP_MOVE_NONE;
l2cap_send_move_chan_cfm(conn, pi, pi->scid,
L2CAP_MOVE_CHAN_UNCONFIRMED);
l2cap_sock_set_timer(sk, L2CAP_MOVE_TIMEOUT);
@@ -5405,6 +5409,8 @@ int l2cap_logical_link_complete(struct hci_chan *chan, u8 status)
pi->ampcon = chan->conn;
pi->ampcon->l2cap_data = pi->conn;
BT_DBG("amp_move_state %d", pi->amp_move_state);
if (sk->sk_state != BT_CONNECTED) {
struct l2cap_conf_rsp rsp;
@@ -5456,12 +5462,14 @@ int l2cap_logical_link_complete(struct hci_chan *chan, u8 status)
pi->amp_move_cmd_ident, pi->dcid,
L2CAP_MOVE_CHAN_SUCCESS);
}
} else {
ampchan = pi->ampchan;
} else if ((pi->amp_move_state !=
L2CAP_AMP_STATE_WAIT_MOVE_RSP_SUCCESS) &&
(pi->amp_move_state !=
L2CAP_AMP_STATE_WAIT_MOVE_CONFIRM)) {
/* Move was not in expected state, free the
* logical link
*/
ampchan = pi->ampchan;
pi->ampchan = NULL;
if (pi->ampcon)
pi->ampcon->l2cap_data = NULL;
@@ -5469,6 +5477,8 @@ int l2cap_logical_link_complete(struct hci_chan *chan, u8 status)
if (ampchan && !hci_chan_put(ampchan))
l2cap_deaggregate(ampchan, pi);
pi->amp_move_state = L2CAP_AMP_STATE_STABLE;
}
} else {
/* Logical link setup failed. */