diff options
| author | Scott Lobdell <slobdell@google.com> | 2022-03-11 19:27:17 +0000 |
|---|---|---|
| committer | Scott Lobdell <slobdell@google.com> | 2022-03-11 19:57:09 +0000 |
| commit | c9218ef1b82430a07d94f74c212a30e7ccc52975 (patch) | |
| tree | 241b7fdeb6bdf1cf3af925ba8996f18faa8973d9 /system/stack/l2cap/l2c_utils.cc | |
| parent | a26bda4d37221f2f7ef750b413502091e3bcddd4 (diff) | |
| parent | 480d2270b269a0e47bf475eb439111f3f966e2a9 (diff) | |
Merge TP1A.220225.003
Change-Id: Id71ac466dbfe3707fe2e544ce22b1da8f474ec2b
Diffstat (limited to 'system/stack/l2cap/l2c_utils.cc')
| -rwxr-xr-x[-rw-r--r--] | system/stack/l2cap/l2c_utils.cc | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/system/stack/l2cap/l2c_utils.cc b/system/stack/l2cap/l2c_utils.cc index ebb7a6d018..647e3ae9ea 100644..100755 --- a/system/stack/l2cap/l2c_utils.cc +++ b/system/stack/l2cap/l2c_utils.cc @@ -23,13 +23,11 @@ ******************************************************************************/ #define LOG_TAG "l2c_utils" +#include <base/logging.h> #include <stdio.h> #include <string.h> -#include "btm_api.h" #include "device/include/controller.h" -#include "l2c_int.h" -#include "l2cdefs.h" #include "main/shim/l2c_api.h" #include "main/shim/shim.h" #include "osi/include/allocator.h" @@ -37,11 +35,12 @@ #include "stack/btm/btm_sec.h" #include "stack/include/acl_api.h" #include "stack/include/bt_hdr.h" +#include "stack/include/btm_api.h" #include "stack/include/hci_error_code.h" +#include "stack/include/l2cdefs.h" +#include "stack/l2cap/l2c_int.h" #include "types/raw_address.h" -#include <base/logging.h> - tL2C_CCB* l2cu_get_next_channel_in_rr(tL2C_LCB* p_lcb); // TODO Move /******************************************************************************* @@ -2948,7 +2947,7 @@ void l2cu_reject_ble_connection(tL2C_CCB* p_ccb, uint8_t rem_id, uint16_t result) { if (p_ccb->ecoc) l2cu_reject_credit_based_conn_req( - p_ccb->p_lcb, rem_id, p_ccb->p_lcb->pending_ecoc_reconfig_cnt, result); + p_ccb->p_lcb, rem_id, p_ccb->p_lcb->pending_ecoc_conn_cnt, result); else l2cu_reject_ble_coc_connection(p_ccb->p_lcb, rem_id, result); } |