lte: Shift component carrier ID in RRC messages so they start with 1

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;