From 1cf7c74ee0b557f20fc8416a4fb1bdfbba4edea9 Mon Sep 17 00:00:00 2001
From: Alexander Krotov <krotov@iitp.ru>
Date: Wed, 7 Jun 2017 17:37:34 +0300
Subject: [PATCH] lte: Skip primary CC instead of first in
 UeManager::BuildNonCriticalExtentionConfigurationCa

---
 src/lte/model/lte-enb-rrc.cc | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/lte/model/lte-enb-rrc.cc b/src/lte/model/lte-enb-rrc.cc
index bdffd6d39..ad8c283d9 100644
--- a/src/lte/model/lte-enb-rrc.cc
+++ b/src/lte/model/lte-enb-rrc.cc
@@ -1399,14 +1399,18 @@ UeManager::BuildNonCriticalExtentionConfigurationCa ()
   std::list<LteRrcSap::SCellToAddMod> SccCon;
 
   // sCellToReleaseList is always empty since no Scc is released
-  auto it = m_rrc->m_componentCarrierPhyConf.begin();
 
-  it++;
-  for (;it!=m_rrc->m_componentCarrierPhyConf.end(); it++)
+  for (auto &it: m_rrc->m_componentCarrierPhyConf)
     {
+      uint8_t ccId = it.first;
 
-      uint8_t ccId = it->first;
-      Ptr<ComponentCarrierEnb> eNbCcm = it->second;
+      // Skip primary CC.
+      if (ccId == m_componentCarrierId)
+        {
+          continue;
+        }
+
+      Ptr<ComponentCarrierEnb> eNbCcm = it.second;
       LteRrcSap::SCellToAddMod component;
       component.sCellIndex = ccId;
       component.cellIdentification.physCellId = eNbCcm->GetCellId ();