From 33a52a970b9e7682ab6f96e7fae2db815ba84899 Mon Sep 17 00:00:00 2001
From: Alexander Krotov <krotov@iitp.ru>
Date: Tue, 13 Jun 2017 17:55:46 +0300
Subject: [PATCH] lte: Shift component carrier ID in RRC messages so they start
 with 1

---
 src/lte/model/lte-enb-rrc.cc | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/lte/model/lte-enb-rrc.cc b/src/lte/model/lte-enb-rrc.cc
index 6c9c04e10..92f852db7 100644
--- a/src/lte/model/lte-enb-rrc.cc
+++ b/src/lte/model/lte-enb-rrc.cc
@@ -1406,11 +1406,16 @@ UeManager::BuildNonCriticalExtentionConfigurationCa ()
     {
       uint8_t ccId = it.first;
 
-      // Skip primary CC.
       if (ccId == m_componentCarrierId)
         {
+          // Skip primary CC.
           continue;
         }
+      else if (ccId < m_componentCarrierId)
+        {
+          // Shift all IDs below PCC forward so PCC can use CC ID 1.
+          ccId++;
+        }
 
       Ptr<ComponentCarrierEnb> eNbCcm = it.second;
       LteRrcSap::SCellToAddMod component;