From be38658455a3967d233c5752e80b08c9f86ce1a6 Mon Sep 17 00:00:00 2001 From: Hansong Zhang Date: Wed, 23 Sep 2020 20:29:22 -0700 Subject: [PATCH] L2CAP: We never explicitly disable FCS Bug: 159815595 Tag: #refactor Test: compile & verify basic functions working Change-Id: If90d75c969277137d356617dec9b8f5c02c5d3f3 --- stack/l2cap/l2c_utils.cc | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/stack/l2cap/l2c_utils.cc b/stack/l2cap/l2c_utils.cc index 3078dc56b..38013dae9 100644 --- a/stack/l2cap/l2c_utils.cc +++ b/stack/l2cap/l2c_utils.cc @@ -1927,12 +1927,9 @@ void l2cu_process_our_cfg_req(tL2C_CCB* p_ccb, tL2CAP_CFG_INFO* p_cfg) { p_ccb->fcrb.max_held_acks = p_cfg->fcr.tx_win_sz / 3; /* Include FCS option only if peer can handle it */ - if (p_ccb->p_lcb->peer_ext_fea & L2CAP_EXTFEA_NO_CRC) { - /* FCS check can be bypassed if peer also desires to bypass */ - if (p_cfg->fcs_present && p_cfg->fcs == L2CAP_CFG_FCS_BYPASS) - p_ccb->bypass_fcs |= L2CAP_CFG_FCS_OUR; - } else + if ((p_ccb->p_lcb->peer_ext_fea & L2CAP_EXTFEA_NO_CRC) == 0) { p_cfg->fcs_present = false; + } } else { p_cfg->fcr.mode = L2CAP_FCR_BASIC_MODE; } -- 2.11.0