Преглед изворни кода

Merge branch 'bugfix/btdm_watchdog_timeout_after_pair_with_iphone' into 'master'

component/bt: Fix BTU task watchdog timeout after pair with iphone

See merge request idf/esp-idf!3366
Jiang Jiang Jian пре 7 година
родитељ
комит
fda865b002
1 измењених фајлова са 4 додато и 3 уклоњено
  1. 4 3
      components/bt/bluedroid/stack/btm/btm_sec.c

+ 4 - 3
components/bt/bluedroid/stack/btm/btm_sec.c

@@ -2761,9 +2761,9 @@ void btm_sec_check_pending_reqs (void)
 
         /* Now, re-submit anything in the mux queue */
         bq = btm_cb.sec_pending_q;
-        if (!btm_cb.sec_pending_q) {
-            btm_cb.sec_pending_q = fixed_queue_new(QUEUE_SIZE_MAX);
-        }
+
+        btm_cb.sec_pending_q = fixed_queue_new(QUEUE_SIZE_MAX);
+
 
         while ((p_e = (tBTM_SEC_QUEUE_ENTRY *)fixed_queue_try_dequeue(bq)) != NULL) {
             /* Check that the ACL is still up before starting security procedures */
@@ -2784,6 +2784,7 @@ void btm_sec_check_pending_reqs (void)
 
             osi_free (p_e);
         }
+        fixed_queue_free(bq, NULL);
     }
 }
 #endif  ///SMP_INCLUDED == TRUE