From 991013ca2c79becbfa214f448f4365452617c60c Mon Sep 17 00:00:00 2001 From: Fabian Eckermann Date: Wed, 6 Oct 2021 10:39:37 +0200 Subject: [PATCH] Fix order of dl/ul common cfg. dl must be first. --- srsue/src/stack/rrc/rrc_nr.cc | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/srsue/src/stack/rrc/rrc_nr.cc b/srsue/src/stack/rrc/rrc_nr.cc index 493333d73..af12af83d 100644 --- a/srsue/src/stack/rrc/rrc_nr.cc +++ b/srsue/src/stack/rrc/rrc_nr.cc @@ -1154,21 +1154,21 @@ bool rrc_nr::apply_sp_cell_cfg(const sp_cell_cfg_s& sp_cell_cfg) logger.warning("Option PCI not present"); return false; } - if (recfg_with_sync.sp_cell_cfg_common.ul_cfg_common_present) { - if (apply_ul_common_cfg(recfg_with_sync.sp_cell_cfg_common.ul_cfg_common) == false) { + // Read essential DL carrier settings + if (recfg_with_sync.sp_cell_cfg_common.dl_cfg_common_present) { + if (apply_dl_common_cfg(recfg_with_sync.sp_cell_cfg_common.dl_cfg_common) == false) { return false; } } else { - logger.warning("Secondary primary cell ul cfg common not present"); + logger.warning("Secondary primary cell dl cfg common not present"); return false; } - // Read essential DL carrier settings - if (recfg_with_sync.sp_cell_cfg_common.dl_cfg_common_present) { - if (apply_dl_common_cfg(recfg_with_sync.sp_cell_cfg_common.dl_cfg_common) == false) { + if (recfg_with_sync.sp_cell_cfg_common.ul_cfg_common_present) { + if (apply_ul_common_cfg(recfg_with_sync.sp_cell_cfg_common.ul_cfg_common) == false) { return false; } } else { - logger.warning("DL cfg common not present"); + logger.warning("Secondary primary cell ul cfg common not present"); return false; } // Build SSB config