Преглед на файлове

Merge branch 'bugfix/exl200_reset_and_adv' into 'master'

Bugfix/exl200 reset and adv

See merge request espressif/esp-idf!11559
Jiang Jiang Jian преди 5 години
родител
ревизия
3d7c55a11e
променени са 2 файла, в които са добавени 3 реда и са изтрити 4 реда
  1. 1 1
      components/bt/controller/lib
  2. 2 3
      components/bt/host/bluedroid/stack/l2cap/l2c_utils.c

+ 1 - 1
components/bt/controller/lib

@@ -1 +1 @@
-Subproject commit 8630c0021bcad2c78f0bd93451d7442cfc5d4ab8
+Subproject commit 790b650953563e102e85c624cd9e3490810f5ca9

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