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

lte: (fixes #2048) Fix scheduler resource allocation when CQI==0 (out of range)

Browse Source
This commit is contained in:
Nicola Baldo
2016-11-22 10:54:20 +01:00
parent 649ef0a0e4
commit f7bab73741
6 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/lte/model/cqa-ff-mac-scheduler.cc
View File

@@ -1164,7 +1164,7 @@ CqaFfMacScheduler::DoSchedDlTriggerReq (const struct FfMacSchedSapProvider::Sche
}
uint8_t cqi1 = sbCqis.at (0);
uint8_t cqi2 = 1;
uint8_t cqi2 = 0;
if (sbCqis.size () > 1)
{
cqi2 = sbCqis.at (1);

2
src/lte/model/fdmt-ff-mac-scheduler.cc
View File

@@ -901,7 +901,7 @@ FdMtFfMacScheduler::DoSchedDlTriggerReq (const struct FfMacSchedSapProvider::Sch
sbCqi = (*itCqi).second.m_higherLayerSelected.at (i).m_sbCqi;
}
uint8_t cqi1 = sbCqi.at (0);
uint8_t cqi2 = 1;
uint8_t cqi2 = 0;
if (sbCqi.size () > 1)
{
cqi2 = sbCqi.at (1);

2
src/lte/model/fdtbfq-ff-mac-scheduler.cc
View File

@@ -1125,7 +1125,7 @@ FdTbfqFfMacScheduler::DoSchedDlTriggerReq (const struct FfMacSchedSapProvider::S
sbCqi = (*itCqi).second.m_higherLayerSelected.at (k).m_sbCqi;
}
uint8_t cqi1 = sbCqi.at (0);
uint8_t cqi2 = 1;
uint8_t cqi2 = 0;
if (sbCqi.size () > 1)
{
cqi2 = sbCqi.at (1);

2
src/lte/model/pf-ff-mac-scheduler.cc
View File

@@ -968,7 +968,7 @@ PfFfMacScheduler::DoSchedDlTriggerReq (const struct FfMacSchedSapProvider::Sched
sbCqi = (*itCqi).second.m_higherLayerSelected.at (i).m_sbCqi;
}
uint8_t cqi1 = sbCqi.at (0);
uint8_t cqi2 = 1;
uint8_t cqi2 = 0;
if (sbCqi.size () > 1)
{
cqi2 = sbCqi.at (1);

6
src/lte/model/pss-ff-mac-scheduler.cc
View File

@@ -1110,7 +1110,7 @@ PssFfMacScheduler::DoSchedDlTriggerReq (const struct FfMacSchedSapProvider::Sche
}
uint8_t cqi1 = sbCqis.at (0);
uint8_t cqi2 = 1;
uint8_t cqi2 = 0;
if (sbCqis.size () > 1)
{
cqi2 = sbCqis.at (1);
@@ -1181,7 +1181,7 @@ PssFfMacScheduler::DoSchedDlTriggerReq (const struct FfMacSchedSapProvider::Sche
}
uint8_t cqi1 = sbCqis.at( 0);
uint8_t cqi2 = 1;
uint8_t cqi2 = 0;
if (sbCqis.size () > 1)
{
cqi2 = sbCqis.at(1);
@@ -1275,7 +1275,7 @@ PssFfMacScheduler::DoSchedDlTriggerReq (const struct FfMacSchedSapProvider::Sche
}
uint8_t cqi1 = sbCqis.at(0);
uint8_t cqi2 = 1;
uint8_t cqi2 = 0;
if (sbCqis.size () > 1)
{
cqi2 = sbCqis.at(1);

2
src/lte/model/tta-ff-mac-scheduler.cc
View File

@@ -916,7 +916,7 @@ TtaFfMacScheduler::DoSchedDlTriggerReq (const struct FfMacSchedSapProvider::Sche
}
uint8_t cqi1 = sbCqi.at (0);
uint8_t cqi2 = 1;
uint8_t cqi2 = 0;
if (sbCqi.size () > 1)
{
cqi2 = sbCqi.at (1);