bartoszek/zephyr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bluetooth: controller: Remove redundant connection initiated check

Browse Source 
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 5ce5dc055e ("Bluetooth: controller:
Avoid race between ULL and LLL when initiating conn") and
commit 18f5fb99c1 ("Bluetooth: controller: Remove use of
lll_stop").

Signed-off-by: Vinayak Kariappa Chettimada <vich@nordicsemi.no>
This commit is contained in:
Vinayak Kariappa Chettimada 2021-03-12 14:52:06 +05:30 committed by Carles Cufí
parent 39a3b3c71e
commit bc782cf11b
5 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
subsys/bluetooth/controller/ll_sw/nordic/lll/lll_adv.c
View File

@ -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;

3
subsys/bluetooth/controller/ll_sw/nordic/lll/lll_adv_aux.c
View File

@ -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;

2
subsys/bluetooth/controller/ll_sw/nordic/lll/lll_scan.c
View File

@ -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;

3
subsys/bluetooth/controller/ll_sw/openisa/lll/lll_adv.c
View File

@ -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;

2
subsys/bluetooth/controller/ll_sw/openisa/lll/lll_scan.c
View File

@ -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;