add scells in case of intra-enb handover

srsenb/src/stack/rrc/rrc_mobility.cc

@@ -911,6 +911,12 @@ void rrc::ue::rrc_mobility::fill_mobility_reconf_common(asn1::rrc::dl_dcch_msg_s
   // Add MeasConfig of target cell
   auto target_earfcns       = get_available_intraenb_earfcns(*rrc_enb->cell_common_list, target_cell.enb_cc_idx);
   recfg_r8.meas_cfg_present = update_ue_var_meas_cfg(src_dl_earfcn, target_earfcns, &recfg_r8.meas_cfg);
+
+  // Add SCells
+  if (rrc_ue->fill_scell_to_addmod_list(&recfg_r8) != SRSLTE_SUCCESS) {
+    rrc_log->warning("Could not create configuration for Scell\n");
+    return;
+  }
 }
 
 /**
@@ -1094,12 +1100,6 @@ void rrc::ue::rrc_mobility::handle_ho_req(idle_st& s, const ho_req_rx_ev& ho_req
   fill_mobility_reconf_common(dl_dcch_msg, *target_cell->cell_common, hoprep_r8.as_cfg.source_dl_carrier_freq);
   rrc_conn_recfg_r8_ies_s& recfg_r8 = dl_dcch_msg.msg.c1().rrc_conn_recfg().crit_exts.c1().rrc_conn_recfg_r8();
 
-  // Add SCells
-  if (rrc_ue->fill_scell_to_addmod_list(&recfg_r8) != SRSLTE_SUCCESS) {
-    rrc_log->warning("Could not create configuration for Scell\n");
-    return;
-  }
-
   // Apply new Security Config based on HandoverRequest
   // See TS 33.401, Sec. 7.2.8.4.3
   recfg_r8.security_cfg_ho_present = true;