--- a/src/wifi/test/block-ack-test-suite.cc	Tue Sep 15 16:13:22 2015 -0700
+++ b/src/wifi/test/block-ack-test-suite.cc	Wed Sep 16 23:34:51 2015 +0200
@@ -97,21 +97,29 @@
 
   uint16_t receivedSeq = 4001 * 16;
   uint32_t mappedSeq = QosUtilsMapSeqControlToUniqueInteger (receivedSeq, endSeq);
-  for (i = m_buffer.begin (); i != m_buffer.end () && QosUtilsMapSeqControlToUniqueInteger ((*i), endSeq) < mappedSeq; i++)
+  /* cycle to right position for this packet */
+  for (i = m_buffer.begin (); i != m_buffer.end (); i++)
     {
+      if (QosUtilsMapSeqControlToUniqueInteger ((*i), endSeq) >= mappedSeq)
+        {
+          //position found
+          break;
+        }
     }
-  {
-    m_buffer.insert (i, receivedSeq);
-  }
+  m_buffer.insert (i, receivedSeq);
 
   receivedSeq = 3999 * 16;
   mappedSeq = QosUtilsMapSeqControlToUniqueInteger (receivedSeq, endSeq);
-  for (i = m_buffer.begin (); i != m_buffer.end () && QosUtilsMapSeqControlToUniqueInteger ((*i), endSeq) < mappedSeq; i++)
+  /* cycle to right position for this packet */
+  for (i = m_buffer.begin (); i != m_buffer.end (); i++)
     {
+      if (QosUtilsMapSeqControlToUniqueInteger ((*i), endSeq) >= mappedSeq)
+        {
+          //position found
+          break;
+        }
     }
-  {
-    m_buffer.insert (i, receivedSeq);
-  }
+  m_buffer.insert (i, receivedSeq);
 
   for (i = m_buffer.begin (), j = m_expectedBuffer.begin (); i != m_buffer.end (); i++, j++)
     {
@@ -181,30 +189,42 @@
 
   uint16_t receivedSeq = 15 * 16;
   uint32_t mappedSeq = QosUtilsMapSeqControlToUniqueInteger (receivedSeq, endSeq);
-  for (i = m_buffer.begin (); i != m_buffer.end () && QosUtilsMapSeqControlToUniqueInteger ((*i), endSeq) < mappedSeq; i++)
+  /* cycle to right position for this packet */
+  for (i = m_buffer.begin (); i != m_buffer.end (); i++)
     {
+      if (QosUtilsMapSeqControlToUniqueInteger ((*i), endSeq) >= mappedSeq)
+        {
+          //position found
+          break;
+        }
     }
-  {
-    m_buffer.insert (i, receivedSeq);
-  }
+  m_buffer.insert (i, receivedSeq);
 
   receivedSeq = 15 * 16 + 1;
   mappedSeq = QosUtilsMapSeqControlToUniqueInteger (receivedSeq, endSeq);
-  for (i = m_buffer.begin (); i != m_buffer.end () && QosUtilsMapSeqControlToUniqueInteger ((*i), endSeq) < mappedSeq; i++)
+  /* cycle to right position for this packet */
+  for (i = m_buffer.begin (); i != m_buffer.end (); i++)
     {
+      if (QosUtilsMapSeqControlToUniqueInteger ((*i), endSeq) >= mappedSeq)
+        {
+          //position found
+          break;
+        }
     }
-  {
-    m_buffer.insert (i, receivedSeq);
-  }
+  m_buffer.insert (i, receivedSeq);
 
   receivedSeq = 4050 * 16;
   mappedSeq = QosUtilsMapSeqControlToUniqueInteger (receivedSeq, endSeq);
-  for (i = m_buffer.begin (); i != m_buffer.end () && QosUtilsMapSeqControlToUniqueInteger ((*i), endSeq) < mappedSeq; i++)
+  /* cycle to right position for this packet */
+  for (i = m_buffer.begin (); i != m_buffer.end (); i++)
     {
+      if (QosUtilsMapSeqControlToUniqueInteger ((*i), endSeq) >= mappedSeq)
+        {
+          //position found
+          break;
+        }
     }
-  {
-    m_buffer.insert (i, receivedSeq);
-  }
+  m_buffer.insert (i, receivedSeq);
 
   for (i = m_buffer.begin (), j = m_expectedBuffer.begin (); i != m_buffer.end (); i++, j++)
     {