diff --git a/srsenb/src/stack/rrc/rrc_ue.cc b/srsenb/src/stack/rrc/rrc_ue.cc index db60e1922..e794e27b5 100644 --- a/srsenb/src/stack/rrc/rrc_ue.cc +++ b/srsenb/src/stack/rrc/rrc_ue.cc @@ -990,18 +990,19 @@ cell_info_common* rrc::ue::get_ue_cc_cfg(uint32_t ue_cc_idx) //! Method to fill SCellToAddModList for SCell info int rrc::ue::fill_scell_to_addmod_list(asn1::rrc::rrc_conn_recfg_r8_ies_s* conn_reconf) { + // check whether we have SCells configured + const cell_info_common* pcell_cfg = get_ue_cc_cfg(UE_PCELL_CC_IDX); + if (pcell_cfg->cell_cfg.scell_list.empty()) { + return SRSLTE_SUCCESS; + } + // Check whether UE supports CA if (not eutra_capabilities.non_crit_ext_present or not eutra_capabilities.non_crit_ext.non_crit_ext_present or not eutra_capabilities.non_crit_ext.non_crit_ext.non_crit_ext_present or not eutra_capabilities.non_crit_ext.non_crit_ext.non_crit_ext.rf_params_v1020_present or eutra_capabilities.non_crit_ext.non_crit_ext.non_crit_ext.rf_params_v1020.supported_band_combination_r10.size() == 0) { - return SRSLTE_SUCCESS; - } - parent->rrc_log->info("SCells activatived for rnti=0x%x\n", rnti); - - const cell_info_common* pcell_cfg = get_ue_cc_cfg(UE_PCELL_CC_IDX); - if (pcell_cfg->cell_cfg.scell_list.empty()) { + parent->rrc_log->info("UE doesn't support CA. Skipping SCell activation\n"); return SRSLTE_SUCCESS; } @@ -1015,6 +1016,8 @@ int rrc::ue::fill_scell_to_addmod_list(asn1::rrc::rrc_conn_recfg_r8_ies_s* conn_ return SRSLTE_SUCCESS; } + parent->rrc_log->info("SCells activated for rnti=0x%x\n", rnti); + conn_reconf->non_crit_ext_present = true; conn_reconf->non_crit_ext.non_crit_ext_present = true; conn_reconf->non_crit_ext.non_crit_ext.non_crit_ext_present = true;