From c6d2c436611cb47e00a68c67ce38b3d8ca6c65d2 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 c31c3c28f1..dcf3317c7d 100644 --- a/components/bt/host/bluedroid/stack/l2cap/l2c_utils.c +++ b/components/bt/host/bluedroid/stack/l2cap/l2c_utils.c @@ -3493,13 +3493,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 b5e93053e52c131edb6ba68896baf5036e737eda Mon Sep 17 00:00:00 2001 From: wangcheng Date: Fri, 18 Dec 2020 11:40:40 +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 6bc8cb91ac..73fa0bcb51 160000 --- a/components/bt/controller/lib +++ b/components/bt/controller/lib @@ -1 +1 @@ -Subproject commit 6bc8cb91ac66473a0cd43a92b19af09f7abb35a1 +Subproject commit 73fa0bcb5132f4ea3eebde88f0599920664a8257