Bluetooth: controller: Fix regression in central event close

cvinayak · cvinayak · commit 013cacf91ed0 · 2020-11-12T06:15:35.000+05:30
Fix regression in connection radio event close in central role introduced in commit 222dca5 Fixes #29957. Signed-off-by: Vinayak Kariappa Chettimada <vich@nordicsemi.no>
diff --git a/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_conn.c b/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_conn.c
@@ -710,7 +710,8 @@ static inline int isr_rx_pdu(struct lll_conn *lll, struct pdu_data *pdu_data_rx,
 			lll->empty = 0;
 
 			pdu_data_tx = (void *)radio_pkt_empty_get();
-			if (IS_ENABLED(CONFIG_BT_CENTRAL) && !lll->role) {
+			if (IS_ENABLED(CONFIG_BT_CENTRAL) && !lll->role &&
+			    !pdu_data_rx->md) {
 				*is_done = !pdu_data_tx->md;
 			}
 
@@ -755,7 +756,8 @@ static inline int isr_rx_pdu(struct lll_conn *lll, struct pdu_data *pdu_data_rx,
 				FORCE_MD_CNT_SET();
 			}
 
-			if (IS_ENABLED(CONFIG_BT_CENTRAL) && !lll->role) {
+			if (IS_ENABLED(CONFIG_BT_CENTRAL) && !lll->role &&
+			    !pdu_data_rx->md) {
 				*is_done = !pdu_data_tx->md;
 			}
 		}

Original file line number	Diff line number	Diff line change
`@@ -710,7 +710,8 @@ static inline int isr_rx_pdu(struct lll_conn lll, struct pdu_data pdu_data_rx,`
`710`	`710`	`lll->empty = 0;`
`711`	`711`
`712`	`712`	`pdu_data_tx = (void *)radio_pkt_empty_get();`
`713`		`- if (IS_ENABLED(CONFIG_BT_CENTRAL) && !lll->role) {`
	`713`	`+ if (IS_ENABLED(CONFIG_BT_CENTRAL) && !lll->role &&`
	`714`	`+ !pdu_data_rx->md) {`
`714`	`715`	`*is_done = !pdu_data_tx->md;`
`715`	`716`	`}`
`716`	`717`
`@@ -755,7 +756,8 @@ static inline int isr_rx_pdu(struct lll_conn lll, struct pdu_data pdu_data_rx,`
`755`	`756`	`FORCE_MD_CNT_SET();`
`756`	`757`	`}`
`757`	`758`
`758`		`- if (IS_ENABLED(CONFIG_BT_CENTRAL) && !lll->role) {`
	`759`	`+ if (IS_ENABLED(CONFIG_BT_CENTRAL) && !lll->role &&`
	`760`	`+ !pdu_data_rx->md) {`
`759`	`761`	`*is_done = !pdu_data_tx->md;`
`760`	`762`	`}`
`761`	`763`	`}`