addressed xavie's comments regarding list of scells to add to rrc reconf message not being in order when we iterate it

master
Francisco Paisana 4 years ago committed by Xavier Arteaga
parent d42cdca729
commit ae32ab9b13

@ -878,9 +878,6 @@ void rrc::ue::rrc_mobility::fill_mobility_reconf_common(asn1::rrc::dl_dcch_msg_s
recfg_r8.rr_cfg_ded.phys_cfg_ded_present = true; recfg_r8.rr_cfg_ded.phys_cfg_ded_present = true;
phys_cfg_ded_s& phy_cfg = recfg_r8.rr_cfg_ded.phys_cfg_ded; phys_cfg_ded_s& phy_cfg = recfg_r8.rr_cfg_ded.phys_cfg_ded;
phy_cfg.pusch_cfg_ded_present = true;
phy_cfg.pusch_cfg_ded = rrc_enb->cfg.pusch_cfg;
// Set SR in new CC // Set SR in new CC
phy_cfg.sched_request_cfg_present = true; phy_cfg.sched_request_cfg_present = true;
auto& sr_setup = phy_cfg.sched_request_cfg.set_setup(); auto& sr_setup = phy_cfg.sched_request_cfg.set_setup();

@ -1044,6 +1044,7 @@ int rrc::ue::fill_scell_to_addmod_list(asn1::rrc::rrc_conn_recfg_r8_ies_s* conn_
auto& list = conn_reconf->non_crit_ext.non_crit_ext.non_crit_ext.scell_to_add_mod_list_r10; auto& list = conn_reconf->non_crit_ext.non_crit_ext.non_crit_ext.scell_to_add_mod_list_r10;
// Add all SCells configured+allocated for the current PCell // Add all SCells configured+allocated for the current PCell
phy_rrc_dedicated_list.resize(cell_ded_list.nof_cells());
for (auto& p : cell_ded_list) { for (auto& p : cell_ded_list) {
if (p.ue_cc_idx == UE_PCELL_CC_IDX) { if (p.ue_cc_idx == UE_PCELL_CC_IDX) {
continue; continue;
@ -1148,7 +1149,6 @@ int rrc::ue::fill_scell_to_addmod_list(asn1::rrc::rrc_conn_recfg_r8_ies_s* conn_
scell_phy_rrc_ded.enb_cc_idx = cc_cfg->enb_cc_idx; scell_phy_rrc_ded.enb_cc_idx = cc_cfg->enb_cc_idx;
// Append to PHY RRC config dedicated which will be applied further down // Append to PHY RRC config dedicated which will be applied further down
phy_rrc_dedicated_list.resize(scell_idx + 1);
phy_rrc_dedicated_list[scell_idx] = scell_phy_rrc_ded; phy_rrc_dedicated_list[scell_idx] = scell_phy_rrc_ded;
} }

Loading…
Cancel
Save