From fbce38dc271028ab3786d9cf0320baf803fd4373 Mon Sep 17 00:00:00 2001 From: Xavier Arteaga Date: Mon, 1 Jun 2020 12:50:29 +0200 Subject: [PATCH] SRSENB: PHY tries to remove always the RNTI in PHY-lib. No error messages prompted. --- srsenb/src/phy/cc_worker.cc | 10 ++++------ srsenb/src/phy/phy_ue_db.cc | 1 - 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/srsenb/src/phy/cc_worker.cc b/srsenb/src/phy/cc_worker.cc index 130deb787..63d23a69e 100644 --- a/srsenb/src/phy/cc_worker.cc +++ b/srsenb/src/phy/cc_worker.cc @@ -208,13 +208,11 @@ void cc_worker::rem_rnti(uint16_t rnti) if (ue_db.count(rnti)) { delete ue_db[rnti]; ue_db.erase(rnti); - - srslte_enb_dl_rem_rnti(&enb_dl, rnti); - srslte_enb_ul_rem_rnti(&enb_ul, rnti); - - } else { - Error("Removing user: rnti=0x%x does not exist\n", rnti); } + + // Always try to remove from PHY-lib + srslte_enb_dl_rem_rnti(&enb_dl, rnti); + srslte_enb_ul_rem_rnti(&enb_ul, rnti); } uint32_t cc_worker::get_nof_rnti() diff --git a/srsenb/src/phy/phy_ue_db.cc b/srsenb/src/phy/phy_ue_db.cc index 8ccfa639c..f9ac06a5b 100644 --- a/srsenb/src/phy/phy_ue_db.cc +++ b/srsenb/src/phy/phy_ue_db.cc @@ -199,7 +199,6 @@ inline int phy_ue_db::_assert_active_enb_cc(uint16_t rnti, uint32_t enb_cc_idx) // Check SCell is active, ignore PCell state const cell_info_t& cell_info = ue_db.at(rnti).cell_info[_get_ue_cc_idx(rnti, enb_cc_idx)]; if (cell_info.state != cell_state_primary and cell_info.state != cell_state_secondary_active) { - ERROR("Failed to assert active eNb cell/carrier %d for RNTI 0x%X", enb_cc_idx, rnti); return SRSLTE_ERROR; }