michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: controller: split: Fix assert on invalid packet sequence

Browse source 
Fix to remove assertion failure check on detecting invalid
packet sequence used by peer central and that no non-empty
packet was transmitted.

Fixes #22967.

Signed-off-by: Vinayak Kariappa Chettimada <vich@nordicsemi.no>
This commit is contained in:
Vinayak Kariappa Chettimada 2020-02-20 14:33:26 +05:30 • committed by Johan Hedberg
commit 62c1e1a52b
1 changed files with 11 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

19
subsys/bluetooth/controller/ll_sw/nordic/lll/lll_conn.c
View file

@ -658,6 +658,9 @@ static int isr_rx_pdu(struct lll_conn *lll, struct pdu_data *pdu_data_rx,
{ {
/* Ack for tx-ed data */ /* Ack for tx-ed data */
if (pdu_data_rx->nesn != lll->sn) { if (pdu_data_rx->nesn != lll->sn) {
struct node_tx *tx;
memq_link_t *link;
/* Increment serial number */ /* Increment serial number */
lll->sn++; lll->sn++;
@ -671,14 +674,16 @@ static int isr_rx_pdu(struct lll_conn *lll, struct pdu_data *pdu_data_rx,
#endif /* CONFIG_BT_PERIPHERAL */ #endif /* CONFIG_BT_PERIPHERAL */
if (!lll->empty) { if (!lll->empty) {
struct pdu_data *pdu_data_tx;
u8_t pdu_data_tx_len;
struct node_tx *tx;
memq_link_t *link;
link = memq_peek(lll->memq_tx.head, lll->memq_tx.tail, link = memq_peek(lll->memq_tx.head, lll->memq_tx.tail,
(void **)&tx); (void **)&tx);
LL_ASSERT(link); } else {
lll->empty = 0;
link = NULL;
}
if (link) {
struct pdu_data *pdu_data_tx;
u8_t pdu_data_tx_len;
pdu_data_tx = (void *)(tx->pdu + pdu_data_tx = (void *)(tx->pdu +
lll->packet_tx_head_offset); lll->packet_tx_head_offset);
@ -710,8 +715,6 @@ static int isr_rx_pdu(struct lll_conn *lll, struct pdu_data *pdu_data_rx,
*tx_release = tx; *tx_release = tx;
} }
} else {
lll->empty = 0;
} }
} }