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

Commit 197aeea2 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "L2CAP: Handle no idle timeout (0xFFFF)"

parents c319c30f ef617c38

system/stack/l2cap/l2c_int.h

+2 −0
Original line number Diff line number Diff line
@@ -54,6 +54,8 @@ constexpr uint16_t L2CAP_LE_CREDIT_THRESHOLD = 0x0040; 
static_assert(L2CAP_LE_CREDIT_THRESHOLD < L2CAP_LE_CREDIT_DEFAULT,

              "Threshold must be smaller then default credits");



#define L2CAP_NO_IDLE_TIMEOUT 0xFFFF



/*

 * Timeout values (in milliseconds).

 */

system/stack/l2cap/l2c_utils.cc

+6 −0
Original line number Diff line number Diff line
@@ -2617,6 +2617,12 @@ void l2cu_no_dynamic_ccbs(tL2C_LCB* p_lcb) { 
  for (xx = 0; xx < L2CAP_NUM_FIXED_CHNLS; xx++) {

    if ((p_lcb->p_fixed_ccbs[xx] != NULL) &&

        (p_lcb->p_fixed_ccbs[xx]->fixed_chnl_idle_tout * 1000 > timeout_ms)) {



      if (p_lcb->p_fixed_ccbs[xx]->fixed_chnl_idle_tout == L2CAP_NO_IDLE_TIMEOUT) {

         L2CAP_TRACE_DEBUG("%s NO IDLE timeout set for fixed cid 0x%04x", __func__,

            p_lcb->p_fixed_ccbs[xx]->local_cid);

         start_timeout = false;

      }

      timeout_ms = p_lcb->p_fixed_ccbs[xx]->fixed_chnl_idle_tout * 1000;

    }

  }