diff --git a/src/lte/model/fdmt-ff-mac-scheduler.cc b/src/lte/model/fdmt-ff-mac-scheduler.cc index ca47623d7..d750206e5 100644 --- a/src/lte/model/fdmt-ff-mac-scheduler.cc +++ b/src/lte/model/fdmt-ff-mac-scheduler.cc @@ -1041,14 +1041,12 @@ FdMtFfMacScheduler::DoSchedDlTriggerReq (const struct FfMacSchedSapProvider::Sch { NS_LOG_INFO (this << " Layer " << (uint16_t)j << " CQI selected " << (uint16_t)worstCqi.at (j)); } - uint32_t bytesTxed = 0; for (uint8_t j = 0; j < nLayer; j++) { newDci.m_mcs.push_back (m_amc->GetMcsFromCqi (worstCqi.at (j))); int tbSize = (m_amc->GetDlTbSizeFromMcs (newDci.m_mcs.at (j), RgbPerRnti * rbgSize) / 8); // (size of TB in bytes according to table 7.1.7.2.1-1 of 36.213) newDci.m_tbsSize.push_back (tbSize); NS_LOG_INFO (this << " Layer " << (uint16_t)j << " MCS selected" << m_amc->GetMcsFromCqi (worstCqi.at (j))); - bytesTxed += tbSize; } newDci.m_resAlloc = 0; // only allocation type 0 at this stage diff --git a/src/lte/model/fdtbfq-ff-mac-scheduler.cc b/src/lte/model/fdtbfq-ff-mac-scheduler.cc index 4c4171cb5..184062f18 100644 --- a/src/lte/model/fdtbfq-ff-mac-scheduler.cc +++ b/src/lte/model/fdtbfq-ff-mac-scheduler.cc @@ -1414,14 +1414,12 @@ FdTbfqFfMacScheduler::DoSchedDlTriggerReq (const struct FfMacSchedSapProvider::S { NS_LOG_INFO (this << " Layer " << (uint16_t)j << " CQI selected " << (uint16_t)worstCqi.at (j)); } - uint32_t bytesTxed = 0; for (uint8_t j = 0; j < nLayer; j++) { newDci.m_mcs.push_back (m_amc->GetMcsFromCqi (worstCqi.at (j))); int tbSize = (m_amc->GetDlTbSizeFromMcs (newDci.m_mcs.at (j), RgbPerRnti * rbgSize) / 8); // (size of TB in bytes according to table 7.1.7.2.1-1 of 36.213) newDci.m_tbsSize.push_back (tbSize); NS_LOG_INFO (this << " Layer " << (uint16_t)j << " MCS selected" << (uint16_t) m_amc->GetMcsFromCqi (worstCqi.at (j))); - bytesTxed += tbSize; } newDci.m_resAlloc = 0; // only allocation type 0 at this stage diff --git a/src/lte/model/lte-rlc-am.cc b/src/lte/model/lte-rlc-am.cc index b81c20f6d..b935c5ab9 100644 --- a/src/lte/model/lte-rlc-am.cc +++ b/src/lte/model/lte-rlc-am.cc @@ -442,7 +442,6 @@ LteRlcAm::DoNotifyTxOpportunity (LteMacSapUser::TxOpportunityParameters txOpPara // Build Data field uint32_t nextSegmentSize = txOpParams.bytes - 4; uint32_t nextSegmentId = 1; - uint32_t dataFieldTotalSize = 0; uint32_t dataFieldAddedSize = 0; std::vector < Ptr > dataField; @@ -540,7 +539,6 @@ LteRlcAm::DoNotifyTxOpportunity (LteMacSapUser::TxOpportunityParameters txOpPara // Add Segment to Data field dataFieldAddedSize = newSegment->GetSize (); - dataFieldTotalSize += dataFieldAddedSize; dataField.push_back (newSegment); newSegment = 0; @@ -563,7 +561,6 @@ LteRlcAm::DoNotifyTxOpportunity (LteMacSapUser::TxOpportunityParameters txOpPara // Add txBuffer.FirstBuffer to DataField dataFieldAddedSize = firstSegment->GetSize (); - dataFieldTotalSize += dataFieldAddedSize; dataField.push_back (firstSegment); firstSegment = 0; @@ -593,7 +590,6 @@ LteRlcAm::DoNotifyTxOpportunity (LteMacSapUser::TxOpportunityParameters txOpPara NS_LOG_LOGIC (" IF firstSegment < NextSegmentSize && txonBuffer.size > 0"); // Add txBuffer.FirstBuffer to DataField dataFieldAddedSize = firstSegment->GetSize (); - dataFieldTotalSize += dataFieldAddedSize; dataField.push_back (firstSegment); // ExtensionBit (Next_Segment - 1) = 1 diff --git a/src/lte/model/lte-rlc-um.cc b/src/lte/model/lte-rlc-um.cc index 1257638a3..5c6cc14e8 100644 --- a/src/lte/model/lte-rlc-um.cc +++ b/src/lte/model/lte-rlc-um.cc @@ -142,7 +142,6 @@ LteRlcUm::DoNotifyTxOpportunity (LteMacSapUser::TxOpportunityParameters txOpPara // Build Data field uint32_t nextSegmentSize = txOpParams.bytes - 2; uint32_t nextSegmentId = 1; - uint32_t dataFieldTotalSize = 0; uint32_t dataFieldAddedSize = 0; std::vector < Ptr > dataField; @@ -241,7 +240,6 @@ LteRlcUm::DoNotifyTxOpportunity (LteMacSapUser::TxOpportunityParameters txOpPara // Add Segment to Data field dataFieldAddedSize = newSegment->GetSize (); - dataFieldTotalSize += dataFieldAddedSize; dataField.push_back (newSegment); newSegment = 0; @@ -263,7 +261,6 @@ LteRlcUm::DoNotifyTxOpportunity (LteMacSapUser::TxOpportunityParameters txOpPara NS_LOG_LOGIC (" IF nextSegmentSize - firstSegment->GetSize () <= 2 || txBuffer.size == 0"); // Add txBuffer.FirstBuffer to DataField dataFieldAddedSize = firstSegment->GetSize (); - dataFieldTotalSize += dataFieldAddedSize; dataField.push_back (firstSegment); firstSegment = 0; @@ -293,7 +290,6 @@ LteRlcUm::DoNotifyTxOpportunity (LteMacSapUser::TxOpportunityParameters txOpPara NS_LOG_LOGIC (" IF firstSegment < NextSegmentSize && txBuffer.size > 0"); // Add txBuffer.FirstBuffer to DataField dataFieldAddedSize = firstSegment->GetSize (); - dataFieldTotalSize += dataFieldAddedSize; dataField.push_back (firstSegment); // ExtensionBit (Next_Segment - 1) = 1 diff --git a/src/lte/model/tta-ff-mac-scheduler.cc b/src/lte/model/tta-ff-mac-scheduler.cc index 13d812076..3300c0461 100644 --- a/src/lte/model/tta-ff-mac-scheduler.cc +++ b/src/lte/model/tta-ff-mac-scheduler.cc @@ -1059,15 +1059,12 @@ TtaFfMacScheduler::DoSchedDlTriggerReq (const struct FfMacSchedSapProvider::Sche { NS_LOG_INFO (this << " Layer " << (uint16_t)j << " CQI selected " << (uint16_t)worstCqi.at (j)); } - uint32_t bytesTxed = 0; for (uint8_t j = 0; j < nLayer; j++) { newDci.m_mcs.push_back (m_amc->GetMcsFromCqi (worstCqi.at (j))); int tbSize = (m_amc->GetDlTbSizeFromMcs (newDci.m_mcs.at (j), RgbPerRnti * rbgSize) / 8); // (size of TB in bytes according to table 7.1.7.2.1-1 of 36.213) newDci.m_tbsSize.push_back (tbSize); NS_LOG_INFO (this << " Layer " << (uint16_t)j << " MCS selected" << m_amc->GetMcsFromCqi (worstCqi.at (j))); - - bytesTxed += tbSize; } newDci.m_resAlloc = 0; // only allocation type 0 at this stage