From 22f3476d882dadfc3992028e350ff309e6772f74 Mon Sep 17 00:00:00 2001 From: Guido Casati Date: Fri, 8 Nov 2024 12:29:07 +0100 Subject: [PATCH] Use copy_f1ap_served_cell_info in update_cell_info * tac is optional IE, and it was assumed as always present * is now allocated in DU container by copy_f1ap_served_cell_info when present in the updated cell info and missing in the DU container --- openair2/RRC/NR/rrc_gNB_du.c | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/openair2/RRC/NR/rrc_gNB_du.c b/openair2/RRC/NR/rrc_gNB_du.c index 639c279d4d..1c2882eaae 100644 --- a/openair2/RRC/NR/rrc_gNB_du.c +++ b/openair2/RRC/NR/rrc_gNB_du.c @@ -446,19 +446,7 @@ static void update_cell_info(nr_rrc_du_container_t *du, const f1ap_served_cell_i AssertFatal(du->setup_req->num_cells_available == 1, "expected 1 cell for DU, but has %d\n", du->setup_req->num_cells_available); f1ap_served_cell_info_t *ci = &du->setup_req->cell[0].info; - - ci->nr_cellid = new_ci->nr_cellid; - ci->nr_pci = new_ci->nr_pci; - if (new_ci->tac != NULL) - *ci->tac = *new_ci->tac; - ci->num_ssi = new_ci->num_ssi; - for (int s = 0; s < new_ci->num_ssi; ++s) - ci->nssai[s] = new_ci->nssai[s]; - ci->mode = new_ci->mode; - if (ci->mode == F1AP_MODE_TDD) - ci->tdd = new_ci->tdd; - else - ci->fdd = new_ci->fdd; + copy_f1ap_served_cell_info(ci, new_ci); NR_MeasurementTimingConfiguration_t *new_mtc = extract_mtc(new_ci->measurement_timing_config, new_ci->measurement_timing_config_len);