From 3da56074c9159b08fb4a28b23f9b623f83973c47 Mon Sep 17 00:00:00 2001
From: zwl <zhaoweiliang@espressif.com>
Date: Wed, 18 Sep 2024 17:03:37 +0800
Subject: [PATCH] fix(ble): fixed occasional crash issue in multi-connect
 scenarios on ESP32-C6

---
 components/bt/CMakeLists.txt                        | 6 +++++-
 components/bt/controller/lib_esp32c6/esp32c6-bt-lib | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/components/bt/CMakeLists.txt b/components/bt/CMakeLists.txt
index ad3dba741f..9dc11d593e 100644
--- a/components/bt/CMakeLists.txt
+++ b/components/bt/CMakeLists.txt
@@ -863,7 +863,11 @@ if(CONFIG_BT_ENABLED)
                 "${CMAKE_CURRENT_LIST_DIR}/controller/lib_esp32c3_family/esp32s3")
         target_link_libraries(${COMPONENT_LIB} PUBLIC btdm_app)
     elseif(CONFIG_BT_CONTROLLER_ENABLED)
-        add_prebuilt_library(libble_app "controller/lib_${target}/${target}-bt-lib/libble_app.a")
+        if(CONFIG_IDF_TARGET_ESP32C6)
+            add_prebuilt_library(libble_app "controller/lib_${target}/${target}-bt-lib/esp32c6/libble_app.a")
+        else()
+            add_prebuilt_library(libble_app "controller/lib_${target}/${target}-bt-lib/libble_app.a")
+        endif()
         target_link_libraries(${COMPONENT_LIB} PRIVATE libble_app)
     endif()
 
diff --git a/components/bt/controller/lib_esp32c6/esp32c6-bt-lib b/components/bt/controller/lib_esp32c6/esp32c6-bt-lib
index f95513f22b..3f15aa1d60 160000
--- a/components/bt/controller/lib_esp32c6/esp32c6-bt-lib
+++ b/components/bt/controller/lib_esp32c6/esp32c6-bt-lib
@@ -1 +1 @@
-Subproject commit f95513f22be7b21429b01ba05dbfbc98097b5e67
+Subproject commit 3f15aa1d602aedf510dd9c686b3f7e5ea8a44002