espressif/esp-nimble
1
0
Fork 0
mirror of https://github.com/espressif/esp-nimble.git synced 2026-10-04 14:07:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #936 from andrzej-kaczmarek/ll-txq-race-fix

Browse Source 
nimble/ll: Fix possible race on TX queue
This commit is contained in:
wes3
2021-03-15 16:58:49 -07:00
committed by GitHub
parent e83b12c03d dda185b528
commit 60ce2cfeeb
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nimble/controller/src/ble_ll.c
+3
View File
@@ -711,6 +711,7 @@ ble_ll_tx_pkt_in(void)
uint16_t pb; uint16_t pb;
struct os_mbuf_pkthdr *pkthdr; struct os_mbuf_pkthdr *pkthdr;
struct os_mbuf *om; struct os_mbuf *om;
os_sr_t sr;
/* Drain all packets off the queue */ /* Drain all packets off the queue */
while (STAILQ_FIRST(&g_ble_ll_data.ll_tx_pkt_q)) { while (STAILQ_FIRST(&g_ble_ll_data.ll_tx_pkt_q)) {
@@ -719,7 +720,9 @@ ble_ll_tx_pkt_in(void)
om = (struct os_mbuf *)((uint8_t *)pkthdr - sizeof(struct os_mbuf)); om = (struct os_mbuf *)((uint8_t *)pkthdr - sizeof(struct os_mbuf));
/* Remove from queue */ /* Remove from queue */
OS_ENTER_CRITICAL(sr);
STAILQ_REMOVE_HEAD(&g_ble_ll_data.ll_tx_pkt_q, omp_next); STAILQ_REMOVE_HEAD(&g_ble_ll_data.ll_tx_pkt_q, omp_next);
OS_EXIT_CRITICAL(sr);
/* Strip HCI ACL header to get handle and length */ /* Strip HCI ACL header to get handle and length */
handle = get_le16(om->om_data); handle = get_le16(om->om_data);