Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bluetooth: controller: legacy: Fix DLE duplicate requests #23708

Merged
merged 2 commits into from
Apr 1, 2020
Merged

Bluetooth: controller: legacy: Fix DLE duplicate requests #23708

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b769d94
Bluetooth: controller: legacy: Simplify DLE state checks
cvinayak Mar 24, 2020
96a78af
Bluetooth: controller: legacy: Fix DLE duplicate requests
cvinayak Mar 24, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 19 additions & 15 deletions subsys/bluetooth/controller/ll_sw/ctrl.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2484,9 +2484,7 @@ static inline u8_t isr_rx_conn_pkt_ctrl_dle(struct pdu_data *pdu_data_rx,
* with response.
*/
((_radio.conn_curr->llcp_length.req ==
_radio.conn_curr->llcp_length.ack) &&
(pdu_data_rx->llctrl.opcode ==
PDU_DATA_LLCTRL_TYPE_LENGTH_REQ)) ||
_radio.conn_curr->llcp_length.ack) && node_tx) ||
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same comment as in #23707; IMHO the original was easier to read

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

#23707 (comment)

/* or Local has active... */
((_radio.conn_curr->llcp_length.req !=
_radio.conn_curr->llcp_length.ack) &&
Expand All @@ -2496,19 +2494,13 @@ static inline u8_t isr_rx_conn_pkt_ctrl_dle(struct pdu_data *pdu_data_rx,
((((_radio.conn_curr->llcp_length.state ==
LLCP_LENGTH_STATE_REQ) ||
(_radio.conn_curr->llcp_length.state ==
LLCP_LENGTH_STATE_REQ_ACK_WAIT)) &&
(pdu_data_rx->llctrl.opcode ==
PDU_DATA_LLCTRL_TYPE_LENGTH_REQ)) ||
LLCP_LENGTH_STATE_REQ_ACK_WAIT)) && node_tx) ||
/* with Local waiting for response, and Peer response then
* complete the Local procedure or Peer request then complete the
* Peer procedure with response.
*/
((_radio.conn_curr->llcp_length.state ==
LLCP_LENGTH_STATE_RSP_WAIT) &&
((pdu_data_rx->llctrl.opcode ==
PDU_DATA_LLCTRL_TYPE_LENGTH_RSP) ||
(pdu_data_rx->llctrl.opcode ==
PDU_DATA_LLCTRL_TYPE_LENGTH_REQ)))))) {
(_radio.conn_curr->llcp_length.state ==
LLCP_LENGTH_STATE_RSP_WAIT)))) {
struct pdu_data_llctrl_length_req *lr;

lr = &pdu_data_rx->llctrl.length_req;
Expand Down Expand Up @@ -2694,9 +2686,21 @@ static inline u8_t isr_rx_conn_pkt_ctrl_dle(struct pdu_data *pdu_data_rx,
*rx_enqueue = 1U;
}
} else {
/* Drop response with no Local initiated request. */
LL_ASSERT(pdu_data_rx->llctrl.opcode ==
PDU_DATA_LLCTRL_TYPE_LENGTH_RSP);
/* Drop response with no Local initiated request and duplicate
* requests.
*/
if (pdu_data_rx->llctrl.opcode !=
PDU_DATA_LLCTRL_TYPE_LENGTH_RSP) {
mem_release(node_tx, &_radio.pkt_tx_ctrl_free);

/* Defer new request if previous in resize state */
if (_radio.conn_curr->llcp_length.state ==
LLCP_LENGTH_STATE_RESIZE) {
return 1U;
}
}

return 0;
}

send_length_resp:
Expand Down