L2cap FCR: Use MTU from registration

Bug: 174845935
Test: manual
Tag: #stability
Change-Id: I817bc44a436de150aa12377741f99d468f42df73

diff --git a/stack/l2cap/l2c_csm.cc b/stack/l2cap/l2c_csm.cc
index 61562fe..e4ff6a2 100644 (file)
--- a/stack/l2cap/l2c_csm.cc
+++ b/stack/l2cap/l2c_csm.cc
@@ -66,6 +66,7 @@ static void l2c_csm_send_config_req(tL2C_CCB* p_ccb) {
   tL2CAP_CFG_INFO config{};
   config.mtu_present = true;
   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) {
     config.fcr_present = true;
     config.fcr = kDefaultErtmOptions;

diff --git a/stack/l2cap/l2c_fcr.cc b/stack/l2cap/l2c_fcr.cc
index e200801..dcf83d8 100644 (file)
--- a/stack/l2cap/l2c_fcr.cc
+++ b/stack/l2cap/l2c_fcr.cc
@@ -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) {
         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;
       } else {
         p_fcrb->p_rx_sdu = (BT_HDR*)osi_malloc(