From ef1c85e0996c2d85528f9dfc0e62d623f9aa51cd Mon Sep 17 00:00:00 2001 From: Robert Schmidt Date: Tue, 16 Jul 2024 10:43:23 +0200 Subject: [PATCH] Use correct RRC UE ID for PDCP, print warning if not existing --- openair2/LAYER2/nr_pdcp/nr_pdcp_ue_manager.c | 2 +- openair2/RRC/NR/rrc_gNB_nsa.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/openair2/LAYER2/nr_pdcp/nr_pdcp_ue_manager.c b/openair2/LAYER2/nr_pdcp/nr_pdcp_ue_manager.c index 7a240a3379..07edfb5814 100644 --- a/openair2/LAYER2/nr_pdcp/nr_pdcp_ue_manager.c +++ b/openair2/LAYER2/nr_pdcp/nr_pdcp_ue_manager.c @@ -124,7 +124,7 @@ void nr_pdcp_manager_remove_ue(nr_pdcp_ue_manager_t *_m, ue_id_t UEid) break; if (i == m->ue_count) { - LOG_D(PDCP, "%s:%d:%s: warning: UE ID/RNTI 0x%" PRIx64 " not found\n", __FILE__, __LINE__, __FUNCTION__, UEid); + LOG_W(PDCP, "%s:%d:%s: warning: UE ID/RNTI 0x%" PRIx64 " not found\n", __FILE__, __LINE__, __FUNCTION__, UEid); return; } diff --git a/openair2/RRC/NR/rrc_gNB_nsa.c b/openair2/RRC/NR/rrc_gNB_nsa.c index a8bc072609..0c8423ead1 100644 --- a/openair2/RRC/NR/rrc_gNB_nsa.c +++ b/openair2/RRC/NR/rrc_gNB_nsa.c @@ -412,8 +412,7 @@ void rrc_remove_nsa_user(gNB_RRC_INST *rrc, int rnti) { return; } - nr_pdcp_remove_UE(ctxt.rntiMaybeUEid); - + nr_pdcp_remove_UE(ue_context->ue_context.rrc_ue_id); rrc_rlc_remove_ue(&ctxt); // lock the scheduler before removing the UE. Note: mac_remove_nr_ue() checks