From: Hansong Zhang Date: Thu, 1 Oct 2020 06:53:46 +0000 (-0700) Subject: Link flush timeout is unused X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=12a0975cd707fc5d0f4f92bc97cb3c496c7fdffa;p=android-x86%2Fsystem-bt.git Link flush timeout is unused Bug: 159815595 Tag: #refactor Test: compile & verify basic functions working Change-Id: Icf6fec9bd038210a31eb8ab38a96f44d3ce2ffd2 --- diff --git a/stack/l2cap/l2c_int.h b/stack/l2cap/l2c_int.h index 2d1c28ad1..d4e00a000 100644 --- a/stack/l2cap/l2c_int.h +++ b/stack/l2cap/l2c_int.h @@ -373,14 +373,6 @@ typedef struct t_l2c_linkcb { void SetBonding() { is_bonding_ = true; } void ResetBonding() { is_bonding_ = false; } - private: - uint16_t link_flush_tout_{0}; /* Flush timeout used */ - public: - uint16_t LinkFlushTimeout() const { return link_flush_tout_; } - void SetLinkFlushTimeout(uint16_t link_flush_tout) { - link_flush_tout_ = link_flush_tout; - } - uint16_t link_xmit_quota; /* Num outstanding pkts allowed */ uint16_t sent_not_acked; /* Num packets sent but not acked */ diff --git a/stack/l2cap/l2c_utils.cc b/stack/l2cap/l2c_utils.cc index a94fabca5..70221dace 100644 --- a/stack/l2cap/l2c_utils.cc +++ b/stack/l2cap/l2c_utils.cc @@ -64,7 +64,6 @@ tL2C_LCB* l2cu_allocate_lcb(const RawAddress& p_bd_addr, bool is_bonding, p_lcb->in_use = true; p_lcb->link_state = LST_DISCONNECTED; p_lcb->InvalidateHandle(); - p_lcb->SetLinkFlushTimeout(L2CAP_NO_AUTOMATIC_FLUSH); p_lcb->l2c_lcb_timer = alarm_new("l2c_lcb.l2c_lcb_timer"); p_lcb->info_resp_timer = alarm_new("l2c_lcb.info_resp_timer"); p_lcb->idle_timeout = l2cb.idle_timeout;