espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-07-30 18:57:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'backport/fix_ble_scan_rsp_v5.2' into 'release/v5.2'

Browse Source 
Backport/fix ble scan rsp v5.2（backport v5.2）

See merge request espressif/esp-idf!27008
This commit is contained in:
Jiang Jiang Jian
2023-11-09 12:16:19 +08:00
parent 4331ae783a 82052a0fc4
commit 9cd791b6ca
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
components/bt/host/bluedroid/api/esp_gap_ble_api.c
View File

@ -576,7 +576,11 @@ esp_err_t esp_ble_gap_set_security_param(esp_ble_sm_param_t param_type,
LOG_ERROR("ESP_BLE_APP_ENC_KEY_SIZE is deprecated, use ESP_GATT_PERM_ENCRYPT_KEY_SIZE in characteristic definition"); LOG_ERROR("ESP_BLE_APP_ENC_KEY_SIZE is deprecated, use ESP_GATT_PERM_ENCRYPT_KEY_SIZE in characteristic definition");
return ESP_ERR_NOT_SUPPORTED; return ESP_ERR_NOT_SUPPORTED;
} }
if (param_type == ESP_BLE_SM_MAX_KEY_SIZE || param_type == ESP_BLE_SM_MIN_KEY_SIZE) {
if (((uint8_t *)value)[0] > 16 || ((uint8_t *)value)[0] < 7) {
return ESP_ERR_INVALID_ARG;
}
}
btc_msg_t msg = {0}; btc_msg_t msg = {0};
btc_ble_gap_args_t arg; btc_ble_gap_args_t arg;

6
components/bt/host/bluedroid/stack/btm/btm_ble_gap.c
View File

@ -3355,7 +3355,11 @@ BOOLEAN btm_ble_update_inq_result(BD_ADDR bda, tINQ_DB_ENT *p_i, UINT8 addr_type
if (evt_type != BTM_BLE_SCAN_RSP_EVT) { if (evt_type != BTM_BLE_SCAN_RSP_EVT) {
p_cur->ble_evt_type = evt_type; p_cur->ble_evt_type = evt_type;
} }
#if BTM_BLE_ACTIVE_SCAN_REPORT_ADV_SCAN_RSP_INDIVIDUALLY
if (evt_type == BTM_BLE_SCAN_RSP_EVT) {
p_cur->ble_evt_type = evt_type;
}
#endif
p_i->inq_count = p_inq->inq_counter; /* Mark entry for current inquiry */ p_i->inq_count = p_inq->inq_counter; /* Mark entry for current inquiry */
if (p_le_inq_cb->adv_len != 0) { if (p_le_inq_cb->adv_len != 0) {