F5/unison
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

lte: Do not assume that first carrier is primary in RrComponentCarrierManager

Browse Source
This commit is contained in:
Alexander Krotov
2017-06-22 11:24:06 +03:00
parent 7960f278cc
commit 02bf6932d6
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/lte/model/no-op-component-carrier-manager.cc
View File

@@ -446,15 +446,15 @@ RrComponentCarrierManager::DoReportBufferStatus (LteMacSapProvider::ReportBuffer
NS_ASSERT_MSG( m_enabledComponentCarrier.find(params.rnti)!=m_enabledComponentCarrier.end(), " UE with provided RNTI not found. RNTI:"<<params.rnti);
if (params.lcid == 0 || params.lcid==1)
uint32_t numberOfCarriersForUe = m_enabledComponentCarrier.find (params.rnti)->second;
if (params.lcid == 0 || params.lcid == 1 || numberOfCarriersForUe == 1)
{
NS_LOG_INFO("Buffer status for lcId=0 and lcId=1 forwarded to the primary carrier.");
m_macSapProvidersMap.find(0)->second->ReportBufferStatus(params);
NS_LOG_INFO("Buffer status forwarded to the primary carrier.");
auto ueManager = m_ccmRrcSapUser->GetUeManager (params.rnti);
m_macSapProvidersMap.at (ueManager->GetComponentCarrierId ())->ReportBufferStatus (params);
}
else
{
uint32_t numberOfCarriersForUe = m_enabledComponentCarrier.find(params.rnti)->second;
params.retxQueueSize /= numberOfCarriersForUe;
params.txQueueSize /= numberOfCarriersForUe;
for ( uint16_t i = 0; i < numberOfCarriersForUe ; i++)
@@ -510,8 +510,8 @@ RrComponentCarrierManager::DoUlReceiveMacCe (MacCeListElement_s bsr, uint8_t com
}
else
{
NS_ASSERT_MSG (m_ccmMacSapProviderMap[0], "Mac sap provider does not exist.");
m_ccmMacSapProviderMap[0]->ReportMacCeToScheduler(bsr);
auto ueManager = m_ccmRrcSapUser->GetUeManager (bsr.m_rnti);
m_ccmMacSapProviderMap.at (ueManager->GetComponentCarrierId ())->ReportMacCeToScheduler (bsr);
}
}