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

Commit c098ccbb authored by Chris Manton's avatar Chris Manton Committed by Automerger Merge Worker
Browse files

Remove unused stack/l2cap::partial_segment_being_sent am: 9dda5faf am:... 

Remove unused stack/l2cap::partial_segment_being_sent am: 9dda5faf am: 1c421888 am: cd00ab1c am: 940ef1d2

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/2084124



Change-Id: Ib6c0f2f993044f891c6f22de6412795e50706420
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 8680ed90 940ef1d2

system/stack/l2cap/l2c_int.h

+0 −2
Original line number Original line Diff line number Diff line
@@ -478,8 +478,6 @@ typedef struct t_l2c_linkcb { 
      sent_not_acked = 0;

      sent_not_acked = 0;

  }

  }





  bool partial_segment_being_sent; /* Set true when a partial segment */

                                   /* is being sent. */

  bool w4_info_rsp;                /* true when info request is active */

  bool w4_info_rsp;                /* true when info request is active */

  uint32_t peer_ext_fea;           /* Peer's extended features mask */

  uint32_t peer_ext_fea;           /* Peer's extended features mask */

  list_t* link_xmit_data_q;        /* Link transmit data buffer queue */

  list_t* link_xmit_data_q;        /* Link transmit data buffer queue */

system/stack/l2cap/l2c_link.cc

+2 −6
Original line number Original line Diff line number Diff line
@@ -933,8 +933,7 @@ void l2c_link_check_send_pkts(tL2C_LCB* p_lcb, uint16_t local_cid, 
        continue;

        continue;

      }

      }





      if ((!p_lcb->in_use) || (p_lcb->partial_segment_being_sent) ||

      if ((!p_lcb->in_use) || (p_lcb->link_state != LST_CONNECTED) ||

          (p_lcb->link_state != LST_CONNECTED) ||

          (p_lcb->link_xmit_quota != 0) || (l2c_link_check_power_mode(p_lcb))) {

          (p_lcb->link_xmit_quota != 0) || (l2c_link_check_power_mode(p_lcb))) {

        LOG_DEBUG("Skipping lcb %d due to quota", xx);

        LOG_DEBUG("Skipping lcb %d due to quota", xx);

        continue;

        continue;
@@ -975,8 +974,7 @@ void l2c_link_check_send_pkts(tL2C_LCB* p_lcb, uint16_t local_cid, 
  } else /* if this is not round-robin service */

  } else /* if this is not round-robin service */

  {

  {

    /* If a partial segment is being sent, can't send anything else */

    /* If a partial segment is being sent, can't send anything else */

    if ((p_lcb->partial_segment_being_sent) ||

    if ((p_lcb->link_state != LST_CONNECTED) ||

        (p_lcb->link_state != LST_CONNECTED) ||

        (l2c_link_check_power_mode(p_lcb))) {

        (l2c_link_check_power_mode(p_lcb))) {

      LOG_INFO("A partial segment is being sent, cannot send anything else");

      LOG_INFO("A partial segment is being sent, cannot send anything else");

      return;

      return;
@@ -1282,8 +1280,6 @@ void l2c_link_segments_xmitted(BT_HDR* p_msg) { 
  /* if we can transmit anything more.                             */

  /* if we can transmit anything more.                             */

  list_prepend(p_lcb->link_xmit_data_q, p_msg);

  list_prepend(p_lcb->link_xmit_data_q, p_msg);





  p_lcb->partial_segment_being_sent = false;



  l2c_link_check_send_pkts(p_lcb, 0, NULL);

  l2c_link_check_send_pkts(p_lcb, 0, NULL);

}

}