From c55fcb59b8bc1cc87a8d802cf00196a4f7dbdc92 Mon Sep 17 00:00:00 2001
From: chengkai <chengkai@xiaomi.com>
Date: Wed, 22 Nov 2023 11:59:41 +0800
Subject: [PATCH] bluetooth:fix bt bridge acl data connect handle not match

bt bridge filter would not match when ACL in data
head with Packet_Boundary_Flag 0b10. in that case connect handle
is the first 3 octets of the packet, which not match
BT_HCI_EVT_LE_CONN_COMPLETE hci event alloc handle.

Signed-off-by: chengkai <chengkai@xiaomi.com>
---
 drivers/wireless/bluetooth/bt_bridge.c | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/drivers/wireless/bluetooth/bt_bridge.c b/drivers/wireless/bluetooth/bt_bridge.c
index 132b3aeb329..46e86ba5ea0 100644
--- a/drivers/wireless/bluetooth/bt_bridge.c
+++ b/drivers/wireless/bluetooth/bt_bridge.c
@@ -117,7 +117,7 @@ static const uint8_t g_bt_filter_ble_evt_table[] =
  ****************************************************************************/
 
 static bool bt_filter_set(FAR uint16_t *array, int size, uint16_t old,
-                          uint16_t new, uint16_t mask)
+                          uint16_t new)
 {
   int i;
 
@@ -125,7 +125,7 @@ static bool bt_filter_set(FAR uint16_t *array, int size, uint16_t old,
     {
       if (array[i] == old)
         {
-          array[i] = new & mask;
+          array[i] = new;
           return true;
         }
     }
@@ -136,7 +136,7 @@ static bool bt_filter_set(FAR uint16_t *array, int size, uint16_t old,
 static bool bt_filter_set_handle(FAR uint16_t *handle, int size,
                                  uint16_t old, uint16_t new)
 {
-  return bt_filter_set(handle, size, old, new, 0xfff);
+  return bt_filter_set(handle, size, old, new);
 }
 
 static bool bt_filter_alloc_handle(FAR struct bt_filter_s *filter,
@@ -163,7 +163,7 @@ static bool bt_filter_has_handle(FAR struct bt_filter_s *filter,
 static bool bt_filter_set_opcode(FAR uint16_t *opcode, int size,
                                  uint16_t old, uint16_t new)
 {
-  return bt_filter_set(opcode, size, old, new, 0xffff);
+  return bt_filter_set(opcode, size, old, new);
 }
 
 static bool bt_filter_alloc_opcode(FAR struct bt_filter_s *filter,
@@ -335,7 +335,11 @@ static bool bt_filter_can_recv(FAR struct bt_filter_s *filter,
     {
       FAR struct bt_hci_acl_hdr_s *acl = (FAR void *)&buffer[0];
 
-      return bt_filter_has_handle(filter, acl->handle);
+      /* When in HCI ACL Data packets,  connection handle is
+       * the first 3 octets of the packet
+       */
+
+      return bt_filter_has_handle(filter, acl->handle & 0x0fff);
     }
 
   return true;