From cc7dbc6177161f91d5b896663afacc1888a18dc2 Mon Sep 17 00:00:00 2001 From: wangcheng Date: Thu, 26 Nov 2020 19:49:29 +0800 Subject: [PATCH 1/2] components/bt: Fixed the problem of early release of pointer(p_ccb) in funcion --- components/bt/host/bluedroid/stack/l2cap/l2c_utils.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/components/bt/host/bluedroid/stack/l2cap/l2c_utils.c b/components/bt/host/bluedroid/stack/l2cap/l2c_utils.c index 2421523ef2..c46c03b1b1 100644 --- a/components/bt/host/bluedroid/stack/l2cap/l2c_utils.c +++ b/components/bt/host/bluedroid/stack/l2cap/l2c_utils.c @@ -3465,13 +3465,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); } } From 386a8e37f19fecc9ef62e72441e6e1272fa985b9 Mon Sep 17 00:00:00 2001 From: wangcheng Date: Thu, 17 Dec 2020 10:57:54 +0800 Subject: [PATCH 2/2] components/bt:fix exl200, add btdm_disable_adv_delay, fix RPA addr update error. --- components/bt/controller/lib | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/bt/controller/lib b/components/bt/controller/lib index 8630c0021b..790b650953 160000 --- a/components/bt/controller/lib +++ b/components/bt/controller/lib @@ -1 +1 @@ -Subproject commit 8630c0021bcad2c78f0bd93451d7442cfc5d4ab8 +Subproject commit 790b650953563e102e85c624cd9e3490810f5ca9