Bluetooth: controller: Fix transaction collision

joerchan · carlescufi · commit f4c8e3ff3197 · 2019-03-19T09:55:41.000+01:00
Peer side will disconnect if controller initiates
Encryption procedure before PHY update procedure
has finished.

Signed-off-by: Joakim Andersson &lt;joakim.andersson@nordicsemi.no&gt;
diff --git a/subsys/bluetooth/controller/ll_sw/ctrl.c b/subsys/bluetooth/controller/ll_sw/ctrl.c
@@ -11346,7 +11346,12 @@ u8_t ll_enc_req_send(u16_t handle, u8_t *rand, u8_t *ediv, u8_t *ltk)
 		return BT_HCI_ERR_UNKNOWN_CONN_ID;
 	}
 
+#if defined(CONFIG_BT_CTLR_PHY)
+	if ((conn->llcp_req != conn->llcp_ack) ||
+	    (conn->llcp_phy.req != conn->llcp_phy.ack)) {
+#else /* CONFIG_BT_CTLR_PHY */
 	if (conn->llcp_req != conn->llcp_ack) {
+#endif /* CONFIG_BT_CTLR_PHY */
 		return BT_HCI_ERR_CMD_DISALLOWED;
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -11346,7 +11346,12 @@ u8_t ll_enc_req_send(u16_t handle, u8_t rand, u8_t ediv, u8_t *ltk)`
`11346`	`11346`	`return BT_HCI_ERR_UNKNOWN_CONN_ID;`
`11347`	`11347`	`}`
`11348`	`11348`
	`11349`	`+#if defined(CONFIG_BT_CTLR_PHY)`
	`11350`	`+ if ((conn->llcp_req != conn->llcp_ack) \|\|`
	`11351`	`+ (conn->llcp_phy.req != conn->llcp_phy.ack)) {`
	`11352`	`+#else /* CONFIG_BT_CTLR_PHY */`
`11349`	`11353`	`if (conn->llcp_req != conn->llcp_ack) {`
	`11354`	`+#endif /* CONFIG_BT_CTLR_PHY */`
`11350`	`11355`	`return BT_HCI_ERR_CMD_DISALLOWED;`
`11351`	`11356`	`}`
`11352`	`11357`