alex/esp-idf
alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2024-10-05 20:47:46 -04:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge branch 'bugfix/fix_duplicate_exception_vsc_5.1' into 'release/v5.1'

Browse Source 
fix(nimble): Fix the parameters in duplicate exception list vsc command(v5.1)

See merge request espressif/esp-idf!27406
This commit is contained in:
Rahul Tank 2023-11-28 15:49:37 +08:00
commit 4f16f201af
2 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
components/bt/esp_ble_mesh/mesh_core/nimble_host/mesh_bearer_adapt.c
View File

@ -1949,10 +1949,6 @@ int bt_mesh_update_exceptional_list(uint8_t sub_code, uint32_t type, void *info)
uint8_t value[6] = {0}; uint8_t value[6] = {0};
int rc = 0; int rc = 0;
#if MYNEWT_VAL(BLE_HCI_VS)
struct ble_hci_vs_duplicate_exception_list_cp cmd;
#endif
if ((sub_code > BLE_MESH_EXCEP_LIST_SUB_CODE_CLEAN) || if ((sub_code > BLE_MESH_EXCEP_LIST_SUB_CODE_CLEAN) ||
(sub_code < BLE_MESH_EXCEP_LIST_SUB_CODE_CLEAN && (sub_code < BLE_MESH_EXCEP_LIST_SUB_CODE_CLEAN &&
type > BLE_MESH_EXCEP_LIST_TYPE_MESH_PROXY_ADV) || type > BLE_MESH_EXCEP_LIST_TYPE_MESH_PROXY_ADV) ||
@ -1973,12 +1969,7 @@ int bt_mesh_update_exceptional_list(uint8_t sub_code, uint32_t type, void *info)
BT_DBG("%s exceptional list, type 0x%08x", sub_code ? "Remove" : "Add", type); BT_DBG("%s exceptional list, type 0x%08x", sub_code ? "Remove" : "Add", type);
#if MYNEWT_VAL(BLE_HCI_VS) #if MYNEWT_VAL(BLE_HCI_VS)
cmd.operation = sub_code; rc = ble_gap_duplicate_exception_list(sub_code, type, value, NULL);
cmd.type = htole32(type);
memcpy(&cmd.device_info, value, 6);
rc = ble_hs_hci_send_vs_cmd(BLE_HCI_OCF_VS_DUPLICATE_EXCEPTION_LIST,
&cmd, sizeof(cmd), NULL, 0);
#endif #endif
return rc; return rc;

2
components/bt/host/nimble/nimble

@ -1 +1 @@
Subproject commit c256dbdab5e9b353363715bb9b39655b0dc01711 Subproject commit c2fac0a589b19f4427734f51b2133016acbab8eb