Bug-fix in UpdateDlRlcBufferInfo of RR and PF schedulers: the 2 bytes of RLC overhead affects only new tx queue and not status and retx ones

This commit is contained in:
mmiozzo
2012-12-12 14:00:23 +01:00
parent 633f099ac0
commit 188befaa56
2 changed files with 2 additions and 2 deletions

View File

@@ -1961,7 +1961,6 @@ PfFfMacScheduler::RefreshUlCqiMaps (void)
void
PfFfMacScheduler::UpdateDlRlcBufferInfo (uint16_t rnti, uint8_t lcid, uint16_t size)
{
size = size - 2; // remove the minimum RLC overhead
std::map<LteFlowId_t, FfMacSchedSapProvider::SchedDlRlcBufferReqParameters>::iterator it;
LteFlowId_t flow (rnti, lcid);
it = m_rlcBufferReq.find (flow);
@@ -1987,6 +1986,7 @@ PfFfMacScheduler::UpdateDlRlcBufferInfo (uint16_t rnti, uint8_t lcid, uint16_t s
}
else
{
size -= 2; // remove minimun RLC overhead due to header
(*it).second.m_rlcTransmissionQueueSize -= size;
}
}

View File

@@ -1752,7 +1752,6 @@ void
RrFfMacScheduler::UpdateDlRlcBufferInfo (uint16_t rnti, uint8_t lcid, uint16_t size)
{
NS_LOG_FUNCTION (this);
size = size - 2; // remove the minimum RLC overhead
std::list<FfMacSchedSapProvider::SchedDlRlcBufferReqParameters>::iterator it;
for (it = m_rlcBufferReq.begin (); it != m_rlcBufferReq.end (); it++)
{
@@ -1778,6 +1777,7 @@ RrFfMacScheduler::UpdateDlRlcBufferInfo (uint16_t rnti, uint8_t lcid, uint16_t s
}
else
{
size -= 2; // remove minimun RLC overhead due to header
(*it).m_rlcTransmissionQueueSize -= size;
}
}