Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8b50d94b authored by Matthew Xie's avatar Matthew Xie Committed by Android Git Automerger
Browse files

am dc03fc7e: am 76a3299a: Merge "LE: Fix shared ACL buffer allocation" into jb-mr2-dev 

* commit 'dc03fc7e':
  LE: Fix shared ACL buffer allocation
parents a336cbde dc03fc7e

system/include/bt_target.h

+6 −0
Original line number Diff line number Diff line
@@ -550,6 +550,12 @@ 
#define L2CAP_FCR_RX_POOL_ID        HCI_ACL_POOL_ID

#endif



/* Number of ACL buffers to assign to LE

   if the HCI buffer pool is shared with BR/EDR */

#ifndef L2C_DEF_NUM_BLE_BUF_SHARED

#define L2C_DEF_NUM_BLE_BUF_SHARED      1

#endif



/* Used by BTM when it sends HCI commands to the controller. */

#ifndef BTM_CMD_POOL_ID

#define BTM_CMD_POOL_ID             GKI_POOL_ID_2

system/stack/l2cap/l2c_ble.c

+5 −1
Original line number Diff line number Diff line
@@ -623,7 +623,11 @@ BOOLEAN l2cble_create_conn (tL2C_LCB *p_lcb) 
void l2c_link_processs_ble_num_bufs (UINT16 num_lm_ble_bufs)

{

    if (num_lm_ble_bufs == 0)

        num_lm_ble_bufs = l2cb.num_lm_acl_bufs;

    {

        num_lm_ble_bufs = L2C_DEF_NUM_BLE_BUF_SHARED;

        l2cb.num_lm_acl_bufs -= L2C_DEF_NUM_BLE_BUF_SHARED;

    }



    l2cb.num_lm_ble_bufs = l2cb.controller_le_xmit_window = num_lm_ble_bufs;

}