michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: controller: Remove incorrect comment

Browse source 
Remove comment stating that UNKNOWN_RSP during encryption procedure
is a workaround.
The core spec mandates that connections should not be dropped if
receiving this control packet during encryption procedure.

Signed-off-by: Joakim Andersson <joakim.andersson@nordicsemi.no>
This commit is contained in:
Joakim Andersson 2019-05-14 15:25:31 +02:00 • committed by Alberto Escolar
commit 289eab6ad5
2 changed files with 0 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

6
subsys/bluetooth/controller/ll_sw/ctrl.c
View file

@ -3446,12 +3446,6 @@ static inline bool isr_rx_conn_enc_unexpected(struct connection *conn,
(opcode != PDU_DATA_LLCTRL_TYPE_REJECT_EXT_IND)))) || (opcode != PDU_DATA_LLCTRL_TYPE_REJECT_EXT_IND)))) ||
(conn->role && (conn->role &&
((!conn->refresh && ((!conn->refresh &&
/* As a workaround to IOP with some old peer controllers that
* respond with Unknown Rsp PDU to our local Slave Initiated
* Feature request during Encryption Setup initiated by the
* peer, we accept this Unknown Rsp PDU during the Encryption
* setup procedure in progress.
*/
(opcode != PDU_DATA_LLCTRL_TYPE_UNKNOWN_RSP) && (opcode != PDU_DATA_LLCTRL_TYPE_UNKNOWN_RSP) &&
(opcode != PDU_DATA_LLCTRL_TYPE_TERMINATE_IND) && (opcode != PDU_DATA_LLCTRL_TYPE_TERMINATE_IND) &&
(opcode != PDU_DATA_LLCTRL_TYPE_START_ENC_RSP) && (opcode != PDU_DATA_LLCTRL_TYPE_START_ENC_RSP) &&

6
subsys/bluetooth/controller/ll_sw/ull_conn.c
View file

@ -3234,12 +3234,6 @@ static inline bool ctrl_is_unexpected(struct ll_conn *conn, u8_t opcode)
(opcode != PDU_DATA_LLCTRL_TYPE_REJECT_EXT_IND)))) || (opcode != PDU_DATA_LLCTRL_TYPE_REJECT_EXT_IND)))) ||
(conn->lll.role && (conn->lll.role &&
((!conn->refresh && ((!conn->refresh &&
/* As a workaround to IOP with some old peer controllers that
* respond with Unknown Rsp PDU to our local Slave Initiated
* Feature request during Encryption Setup initiated by the
* peer, we accept this Unknown Rsp PDU during the Encryption
* setup procedure in progress.
*/
(opcode != PDU_DATA_LLCTRL_TYPE_UNKNOWN_RSP) && (opcode != PDU_DATA_LLCTRL_TYPE_UNKNOWN_RSP) &&
(opcode != PDU_DATA_LLCTRL_TYPE_TERMINATE_IND) && (opcode != PDU_DATA_LLCTRL_TYPE_TERMINATE_IND) &&
(opcode != PDU_DATA_LLCTRL_TYPE_START_ENC_RSP) && (opcode != PDU_DATA_LLCTRL_TYPE_START_ENC_RSP) &&