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

Commit a96d4206 authored by Hansong Zhang's avatar Hansong Zhang Committed by Automerger Merge Worker
Browse files

L2cap FCR: Use MTU from registration am: 102c0085 am: 48043cae 

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1562455

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1bdc3dfe20ff821a5abaf537ae9c3260575938da
parents bfa8d950 48043cae

system/stack/l2cap/l2c_csm.cc

+1 −0
Original line number Original line Diff line number Diff line
@@ -66,6 +66,7 @@ static void l2c_csm_send_config_req(tL2C_CCB* p_ccb) { 
  tL2CAP_CFG_INFO config{};

  tL2CAP_CFG_INFO config{};

  config.mtu_present = true;

  config.mtu_present = true;

  config.mtu = p_ccb->p_rcb->my_mtu;

  config.mtu = p_ccb->p_rcb->my_mtu;

  p_ccb->max_rx_mtu = config.mtu;

  if (p_ccb->p_rcb->ertm_info.preferred_mode != L2CAP_FCR_BASIC_MODE) {

  if (p_ccb->p_rcb->ertm_info.preferred_mode != L2CAP_FCR_BASIC_MODE) {

    config.fcr_present = true;

    config.fcr_present = true;

    config.fcr = kDefaultErtmOptions;

    config.fcr = kDefaultErtmOptions;

system/stack/l2cap/l2c_fcr.cc

+1 −1
Original line number Original line Diff line number Diff line
@@ -1193,7 +1193,7 @@ static bool do_sar_reassembly(tL2C_CCB* p_ccb, BT_HDR* p_buf, 




      if (p_fcrb->rx_sdu_len > p_ccb->max_rx_mtu) {

      if (p_fcrb->rx_sdu_len > p_ccb->max_rx_mtu) {

        L2CAP_TRACE_WARNING("SAR - SDU len: %u  larger than MTU: %u",

        L2CAP_TRACE_WARNING("SAR - SDU len: %u  larger than MTU: %u",

                            p_fcrb->rx_sdu_len, p_fcrb->rx_sdu_len);

                            p_fcrb->rx_sdu_len, p_ccb->max_rx_mtu);

        packet_ok = false;

        packet_ok = false;

      } else {

      } else {

        p_fcrb->p_rx_sdu = (BT_HDR*)osi_malloc(

        p_fcrb->p_rx_sdu = (BT_HDR*)osi_malloc(