From 86de405578de5e3c00c1f75ead2cef24defef437 Mon Sep 17 00:00:00 2001 From: weitianhua Date: Tue, 22 Dec 2020 15:08:59 +0800 Subject: [PATCH 1/2] Collection of bugfix backport for release/v3.3 --- components/bt/lib | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/bt/lib b/components/bt/lib index e804c800d7..177397a063 160000 --- a/components/bt/lib +++ b/components/bt/lib @@ -1 +1 @@ -Subproject commit e804c800d77045db5fd9aaf7f048bf55744f61a5 +Subproject commit 177397a0632761f4bf90236341d431a4bfadf86f From 282d234ea5e5e424b98ceb51a8b7ad1f750d736a Mon Sep 17 00:00:00 2001 From: weitianhua Date: Tue, 22 Dec 2020 15:12:55 +0800 Subject: [PATCH 2/2] components/bt: Fixed the problem of early release of pointer(p_ccb) in funcion --- components/bt/bluedroid/stack/l2cap/l2c_utils.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/components/bt/bluedroid/stack/l2cap/l2c_utils.c b/components/bt/bluedroid/stack/l2cap/l2c_utils.c index 22443faecd..4279a9961c 100644 --- a/components/bt/bluedroid/stack/l2cap/l2c_utils.c +++ b/components/bt/bluedroid/stack/l2cap/l2c_utils.c @@ -3488,13 +3488,12 @@ BT_HDR *l2cu_get_next_buffer_to_send (tL2C_LCB *p_lcb) L2CAP_TRACE_ERROR("l2cu_get_buffer_to_send: No data to be sent"); return (NULL); } + l2cu_check_channel_congestion (p_ccb); + l2cu_set_acl_hci_header (p_buf, p_ccb); /* send tx complete */ if (l2cb.fixed_reg[xx].pL2CA_FixedTxComplete_Cb) { (*l2cb.fixed_reg[xx].pL2CA_FixedTxComplete_Cb)(p_ccb->local_cid, 1); } - - l2cu_check_channel_congestion (p_ccb); - l2cu_set_acl_hci_header (p_buf, p_ccb); return (p_buf); } }