Przeglądaj źródła

Merge branch 'bugfix/collection_bugfix_backport_for_3_3' into 'release/v3.3'

Bugfix/collection bugfix backport for 3 3

See merge request espressif/esp-idf!11708
Jiang Jiang Jian 5 lat temu
rodzic
commit
896180ec73

+ 2 - 3
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);
             }
         }

+ 1 - 1
components/bt/lib

@@ -1 +1 @@
-Subproject commit e804c800d77045db5fd9aaf7f048bf55744f61a5
+Subproject commit 177397a0632761f4bf90236341d431a4bfadf86f