--- a/RELEASE_NOTES Sat Aug 30 18:20:10 2014 +0200
+++ b/RELEASE_NOTES Wed Sep 03 13:42:12 2014 +0200
@@ -32,6 +32,8 @@
- Bug 1762 - UE stuck in IDLE_CONNECTING because RRC CONN REQ is not transmitted
- Bug 1831 - TcpSocket SlowStartThreshold is not a TraceSource
+- Bug 1854 - std::out_of_range Problem
+- Bug 1893 - issue in DoSchedUlTriggerReq with harq
- Bug 1921 - Icmpv6L4Protocol::ForgeEchoRequest returns a malformed packet
- Bug 1930 - Use of invalid reference in OLSR RemoveLinkTuple
- Bug 1932 - NdiscCache entry is not failsafe on double neighbor probing.
--- a/src/lte/model/cqa-ff-mac-scheduler.cc Sat Aug 30 18:20:10 2014 +0200
+++ b/src/lte/model/cqa-ff-mac-scheduler.cc Wed Sep 03 13:42:12 2014 +0200
@@ -834,7 +834,6 @@
{
m_rachAllocationMap.at (i) = (*itRach).m_rnti;
}
- rbStart = rbStart + rbLen;
if (m_harqOn == true)
{
@@ -874,6 +873,7 @@
(*itDci).second.at (harqId) = uldci;
}
+ rbStart = rbStart + rbLen;
ret.m_buildRarList.push_back (newRar);
}
m_rachList.clear ();
--- a/src/lte/model/fdbet-ff-mac-scheduler.cc Sat Aug 30 18:20:10 2014 +0200
+++ b/src/lte/model/fdbet-ff-mac-scheduler.cc Wed Sep 03 13:42:12 2014 +0200
@@ -697,7 +697,6 @@
{
m_rachAllocationMap.at (i) = (*itRach).m_rnti;
}
- rbStart = rbStart + rbLen;
if (m_harqOn == true)
{
@@ -737,6 +736,7 @@
(*itDci).second.at (harqId) = uldci;
}
+ rbStart = rbStart + rbLen;
ret.m_buildRarList.push_back (newRar);
}
m_rachList.clear ();
--- a/src/lte/model/fdmt-ff-mac-scheduler.cc Sat Aug 30 18:20:10 2014 +0200
+++ b/src/lte/model/fdmt-ff-mac-scheduler.cc Wed Sep 03 13:42:12 2014 +0200
@@ -685,7 +685,6 @@
{
m_rachAllocationMap.at (i) = (*itRach).m_rnti;
}
- rbStart = rbStart + rbLen;
if (m_harqOn == true)
{
@@ -725,6 +724,7 @@
(*itDci).second.at (harqId) = uldci;
}
+ rbStart = rbStart + rbLen;
ret.m_buildRarList.push_back (newRar);
}
m_rachList.clear ();
--- a/src/lte/model/fdtbfq-ff-mac-scheduler.cc Sat Aug 30 18:20:10 2014 +0200
+++ b/src/lte/model/fdtbfq-ff-mac-scheduler.cc Wed Sep 03 13:42:12 2014 +0200
@@ -740,9 +740,8 @@
{
m_rachAllocationMap.at (i) = (*itRach).m_rnti;
}
- rbStart = rbStart + rbLen;
- if (m_harqOn == true)
+ if (m_harqOn == true)
{
// generate UL-DCI for HARQ retransmissions
UlDciListElement_s uldci;
@@ -780,6 +779,7 @@
(*itDci).second.at (harqId) = uldci;
}
+ rbStart = rbStart + rbLen;
ret.m_buildRarList.push_back (newRar);
}
m_rachList.clear ();
--- a/src/lte/model/pf-ff-mac-scheduler.cc Sat Aug 30 18:20:10 2014 +0200
+++ b/src/lte/model/pf-ff-mac-scheduler.cc Wed Sep 03 13:42:12 2014 +0200
@@ -696,7 +696,6 @@
{
m_rachAllocationMap.at (i) = (*itRach).m_rnti;
}
- rbStart = rbStart + rbLen;
if (m_harqOn == true)
{
@@ -736,6 +735,7 @@
(*itDci).second.at (harqId) = uldci;
}
+ rbStart = rbStart + rbLen;
ret.m_buildRarList.push_back (newRar);
}
m_rachList.clear ();
--- a/src/lte/model/pss-ff-mac-scheduler.cc Sat Aug 30 18:20:10 2014 +0200
+++ b/src/lte/model/pss-ff-mac-scheduler.cc Wed Sep 03 13:42:12 2014 +0200
@@ -724,7 +724,6 @@
{
m_rachAllocationMap.at (i) = (*itRach).m_rnti;
}
- rbStart = rbStart + rbLen;
if (m_harqOn == true)
{
@@ -764,6 +763,7 @@
(*itDci).second.at (harqId) = uldci;
}
+ rbStart = rbStart + rbLen;
ret.m_buildRarList.push_back (newRar);
}
m_rachList.clear ();
--- a/src/lte/model/rr-ff-mac-scheduler.cc Sat Aug 30 18:20:10 2014 +0200
+++ b/src/lte/model/rr-ff-mac-scheduler.cc Wed Sep 03 13:42:12 2014 +0200
@@ -663,7 +663,6 @@
{
m_rachAllocationMap.at (i) = (*itRach).m_rnti;
}
- rbStart = rbStart + rbLen;
if (m_harqOn == true)
{
@@ -703,6 +702,7 @@
(*itDci).second.at (harqId) = uldci;
}
+ rbStart = rbStart + rbLen;
ret.m_buildRarList.push_back (newRar);
}
m_rachList.clear ();
--- a/src/lte/model/tdbet-ff-mac-scheduler.cc Sat Aug 30 18:20:10 2014 +0200
+++ b/src/lte/model/tdbet-ff-mac-scheduler.cc Wed Sep 03 13:42:12 2014 +0200
@@ -696,7 +696,6 @@
{
m_rachAllocationMap.at (i) = (*itRach).m_rnti;
}
- rbStart = rbStart + rbLen;
if (m_harqOn == true)
{
@@ -736,6 +735,7 @@
(*itDci).second.at (harqId) = uldci;
}
+ rbStart = rbStart + rbLen;
ret.m_buildRarList.push_back (newRar);
}
m_rachList.clear ();
--- a/src/lte/model/tdmt-ff-mac-scheduler.cc Sat Aug 30 18:20:10 2014 +0200
+++ b/src/lte/model/tdmt-ff-mac-scheduler.cc Wed Sep 03 13:42:12 2014 +0200
@@ -685,7 +685,6 @@
{
m_rachAllocationMap.at (i) = (*itRach).m_rnti;
}
- rbStart = rbStart + rbLen;
if (m_harqOn == true)
{
@@ -725,6 +724,7 @@
(*itDci).second.at (harqId) = uldci;
}
+ rbStart = rbStart + rbLen;
ret.m_buildRarList.push_back (newRar);
}
m_rachList.clear ();
--- a/src/lte/model/tdtbfq-ff-mac-scheduler.cc Sat Aug 30 18:20:10 2014 +0200
+++ b/src/lte/model/tdtbfq-ff-mac-scheduler.cc Wed Sep 03 13:42:12 2014 +0200
@@ -740,7 +740,6 @@
{
m_rachAllocationMap.at (i) = (*itRach).m_rnti;
}
- rbStart = rbStart + rbLen;
if (m_harqOn == true)
{
@@ -780,6 +779,7 @@
(*itDci).second.at (harqId) = uldci;
}
+ rbStart = rbStart + rbLen;
ret.m_buildRarList.push_back (newRar);
}
m_rachList.clear ();
--- a/src/lte/model/tta-ff-mac-scheduler.cc Sat Aug 30 18:20:10 2014 +0200
+++ b/src/lte/model/tta-ff-mac-scheduler.cc Wed Sep 03 13:42:12 2014 +0200
@@ -685,7 +685,6 @@
{
m_rachAllocationMap.at (i) = (*itRach).m_rnti;
}
- rbStart = rbStart + rbLen;
if (m_harqOn == true)
{
@@ -725,6 +724,7 @@
(*itDci).second.at (harqId) = uldci;
}
+ rbStart = rbStart + rbLen;
ret.m_buildRarList.push_back (newRar);
}
m_rachList.clear ();