Merge branch 'bugfix/btdm_fix_hci_enhance_conn_complete_evt_unpack_error_v3.1' into 'release/v3.1'
component/bt: fix unpack hci enhance connection complete event error(backport v3.1) See merge request idf/esp-idf!5283
This commit is contained in:
commit
8dd3bb07f8
1 changed files with 3 additions and 6 deletions
|
@ -1931,9 +1931,7 @@ void btm_ble_conn_complete(UINT8 *p, UINT16 evt_len, BOOLEAN enhanced)
|
||||||
UINT8 role, status, bda_type;
|
UINT8 role, status, bda_type;
|
||||||
UINT16 handle;
|
UINT16 handle;
|
||||||
BD_ADDR bda;
|
BD_ADDR bda;
|
||||||
#if (BLE_PRIVACY_SPT == TRUE)
|
|
||||||
BD_ADDR local_rpa, peer_rpa;
|
BD_ADDR local_rpa, peer_rpa;
|
||||||
#endif ///BLE_PRIVACY_SPT == TRUE
|
|
||||||
UINT16 conn_interval, conn_latency, conn_timeout;
|
UINT16 conn_interval, conn_latency, conn_timeout;
|
||||||
BOOLEAN match = FALSE;
|
BOOLEAN match = FALSE;
|
||||||
UNUSED(evt_len);
|
UNUSED(evt_len);
|
||||||
|
@ -1944,14 +1942,13 @@ void btm_ble_conn_complete(UINT8 *p, UINT16 evt_len, BOOLEAN enhanced)
|
||||||
STREAM_TO_BDADDR (bda, p);
|
STREAM_TO_BDADDR (bda, p);
|
||||||
BTM_TRACE_DEBUG("status = %d, handle = %d, role = %d, bda_type = %d",status,handle,role,bda_type);
|
BTM_TRACE_DEBUG("status = %d, handle = %d, role = %d, bda_type = %d",status,handle,role,bda_type);
|
||||||
if (status == 0) {
|
if (status == 0) {
|
||||||
#if (BLE_PRIVACY_SPT == TRUE )
|
|
||||||
peer_addr_type = bda_type;
|
|
||||||
match = btm_identity_addr_to_random_pseudo (bda, &bda_type, TRUE);
|
|
||||||
|
|
||||||
if (enhanced) {
|
if (enhanced) {
|
||||||
STREAM_TO_BDADDR (local_rpa, p);
|
STREAM_TO_BDADDR (local_rpa, p);
|
||||||
STREAM_TO_BDADDR (peer_rpa, p);
|
STREAM_TO_BDADDR (peer_rpa, p);
|
||||||
}
|
}
|
||||||
|
#if (BLE_PRIVACY_SPT == TRUE )
|
||||||
|
peer_addr_type = bda_type;
|
||||||
|
match = btm_identity_addr_to_random_pseudo (bda, &bda_type, TRUE);
|
||||||
|
|
||||||
/* possiblly receive connection complete with resolvable random on
|
/* possiblly receive connection complete with resolvable random on
|
||||||
slave role while the device has been paired */
|
slave role while the device has been paired */
|
||||||
|
|
Loading…
Reference in a new issue