Commit bc782cf1 authored by Vinayak Kariappa Chettimada's avatar Vinayak Kariappa Chettimada Committed by Carles Cufi
Browse files

Bluetooth: controller: Remove redundant connection initiated check 



Remove the redundant connection initiated check as the event
is closed on connection initiated and it is sufficient to
check in the prepare_cb function to abort any events in the
pipeline after the connection has been initiated.

Relates to commit 5ce5dc05 ("Bluetooth: controller:
Avoid race between ULL and LLL when initiating conn") and
commit 18f5fb99 ("Bluetooth: controller: Remove use of
lll_stop").

Signed-off-by: default avatarVinayak Kariappa Chettimada <vich@nordicsemi.no>
parent 39a3b3c7

subsys/bluetooth/controller/ll_sw/nordic/lll/lll_adv.c

+1 −2
Original line number Diff line number Diff line
@@ -1333,8 +1333,7 @@ static inline int isr_rx_pdu(struct lll_adv *lll, 
		   lll_adv_connect_ind_check(lll, pdu_rx, tx_addr, addr,

					     rx_addr, tgt_addr,

					     devmatch_ok, &rl_idx) &&

		   lll->conn &&

		   !lll->conn->initiated) {

		   lll->conn) {

		struct node_rx_ftr *ftr;

		struct node_rx_pdu *rx;

subsys/bluetooth/controller/ll_sw/nordic/lll/lll_adv_aux.c

+1 −2
Original line number Diff line number Diff line
@@ -577,8 +577,7 @@ static inline int isr_rx_pdu(struct lll_adv_aux *lll_aux, 
		   lll_adv_connect_ind_check(lll, pdu_rx, tx_addr, addr,

					     rx_addr, tgt_addr,

					     devmatch_ok, &rl_idx) &&

		   lll->conn &&

		   !lll->conn->initiated) {

		   lll->conn) {

		struct node_rx_ftr *ftr;

		struct node_rx_pdu *rx;

		struct pdu_adv *pdu_tx;

subsys/bluetooth/controller/ll_sw/nordic/lll/lll_scan.c

+1 −1
Original line number Diff line number Diff line
@@ -777,7 +777,7 @@ static inline int isr_rx_pdu(struct lll_scan *lll, struct pdu_adv *pdu_adv_rx, 
	if (0) {

#if defined(CONFIG_BT_CENTRAL)

	/* Initiator */

	} else if (lll->conn && !lll->conn->initiated &&

	} else if (lll->conn &&

		   isr_scan_init_check(lll, pdu_adv_rx, rl_idx)) {

		struct lll_conn *lll_conn;

		struct node_rx_ftr *ftr;

subsys/bluetooth/controller/ll_sw/openisa/lll/lll_adv.c

+1 −2
Original line number Diff line number Diff line
@@ -898,8 +898,7 @@ static inline int isr_rx_pdu(struct lll_adv *lll, 
		   (pdu_rx->len == sizeof(struct pdu_adv_connect_ind)) &&

		   isr_rx_ci_check(lll, pdu_adv, pdu_rx, devmatch_ok,

				   &rl_idx) &&

		   lll->conn &&

		   !lll->conn->initiated) {

		   lll->conn) {

		struct node_rx_ftr *ftr;

		struct node_rx_pdu *rx;

subsys/bluetooth/controller/ll_sw/openisa/lll/lll_scan.c

+1 −1
Original line number Diff line number Diff line
@@ -674,7 +674,7 @@ static inline uint32_t isr_rx_pdu(struct lll_scan *lll, uint8_t devmatch_ok, 
	if (0) {

#if defined(CONFIG_BT_CENTRAL)

	/* Initiator */

	} else if (lll->conn && !lll->conn->initiated &&

	} else if (lll->conn &&

		   isr_scan_init_check(lll, pdu_adv_rx, rl_idx)) {

		struct lll_conn *lll_conn;

		struct node_rx_ftr *ftr;

CRA Git | Maintained and supported by SUSTech CRA and CCSE