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

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

l2c_csm: Remove unused variable am: bd064d88 am: 6b7afd99 am: eff42fbb 

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

Change-Id: I0ee02fd48260243ef426688765bf05db344a0811
parents 2b4d1f10 eff42fbb

system/stack/l2cap/l2c_int.h

+0 −1
Original line number Diff line number Diff line
@@ -245,7 +245,6 @@ typedef struct t_l2c_ccb { 
  alarm_t* l2c_ccb_timer; /* CCB Timer Entry */



  tL2C_RCB* p_rcb;      /* Registration CB for this Channel */

  bool should_free_rcb; /* True if RCB was allocated on the heap */



#define IB_CFG_DONE 0x01

#define OB_CFG_DONE 0x02

system/stack/l2cap/l2c_utils.cc

+0 −7
Original line number Diff line number Diff line
@@ -1328,7 +1328,6 @@ tL2C_CCB* l2cu_allocate_ccb(tL2C_LCB* p_lcb, uint16_t cid) { 


  p_ccb->p_lcb = p_lcb;

  p_ccb->p_rcb = NULL;

  p_ccb->should_free_rcb = false;



  /* Set priority then insert ccb into LCB queue (if we have an LCB) */

  p_ccb->ccb_priority = L2CAP_CHNL_PRIORITY_LOW;
@@ -1474,12 +1473,6 @@ void l2cu_release_ccb(tL2C_CCB* p_ccb) { 
    BTM_SecClrServiceByPsm(p_rcb->psm);

  }



  if (p_ccb->should_free_rcb) {

    osi_free(p_rcb);

    p_ccb->p_rcb = NULL;

    p_ccb->should_free_rcb = false;

  }



  /* Free the timer */

  alarm_free(p_ccb->l2c_ccb_timer);

  p_ccb->l2c_ccb_timer = NULL;