commit f780ff81547b07a5995c575222de5463279439c9
author Vinayak Kariappa Chettimada <vich@nordicsemi.no> Wed Jun 05 12:47:12 2024 +0200
committer Johan Hedberg <johan.hedberg@gmail.com> Mon Jul 22 10:35:25 2024 +0300
tree 4b510472460a2f3b6f87914612f724bf25ed588f
parent acfd2b279d673effbb707126b37e071393c8fa6f

Bluetooth: Controller: Use BT_HCI_ERR_UNSPECIFIED as needed

A Host shall consider any error code that it does not
explicitly understand equivalent to the error code
Unspecified Error (0x1F).

Signed-off-by: Vinayak Kariappa Chettimada <vich@nordicsemi.no>
(cherry picked from commit 78466c8f52c77d54c12641a83d61c4db1cb5dd8d)
Signed-off-by: Vinayak Kariappa Chettimada <vich@nordicsemi.no>

subsys/bluetooth/controller/hci/hci.c

diff --git a/subsys/bluetooth/controller/hci/hci.c b/subsys/bluetooth/controller/hci/hci.c
index 7711aff..54f7027 100644
--- a/subsys/bluetooth/controller/hci/hci.c
+++ b/subsys/bluetooth/controller/hci/hci.c
@@ -8516,7 +8516,7 @@
 	hci_evt_create(buf, BT_HCI_EVT_ENCRYPT_CHANGE, sizeof(*ep));
 	ep = net_buf_add(buf, sizeof(*ep));
 
-	ep->status = err;
+	ep->status = err ? err : (encryption_on ? err : BT_HCI_ERR_UNSPECIFIED);
 	ep->handle = sys_cpu_to_le16(handle);
 	ep->encrypt = encryption_on ? 1 : 0;
 }