From 2ade364434702861e89943b104e5c781df519ac7 Mon Sep 17 00:00:00 2001
From: Francisco Paisana <francisco.paisana@softwareradiosystems.com>
Date: Mon, 2 Nov 2020 17:25:23 +0000
Subject: [PATCH] defer scell activation to rrc reconf complete reception

---
 srsenb/src/stack/rrc/mac_controller.cc | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/srsenb/src/stack/rrc/mac_controller.cc b/srsenb/src/stack/rrc/mac_controller.cc
index e75534a73..c2b414aa4 100644
--- a/srsenb/src/stack/rrc/mac_controller.cc
+++ b/srsenb/src/stack/rrc/mac_controller.cc
@@ -117,6 +117,11 @@ int rrc::ue::mac_controller::handle_crnti_ce(uint32_t temp_crnti)
   // Change PCell and add SCell configurations to MAC/Scheduler
   current_sched_ue_cfg = next_sched_ue_cfg;
 
+  // Disable SCells, until RRCReconfComplete is received, otherwise the SCell Act MAC CE is sent too early
+  for (uint32_t i = 1; i < current_sched_ue_cfg.supported_cc_list.size(); ++i) {
+    current_sched_ue_cfg.supported_cc_list[i].active = false;
+  }
+
   // keep DRBs disabled until RRCReconfComplete is received
   set_drb_activation(false);