Rename MacLow::RxCompleteBufferedPacket to a more appropriate name
authorMirko Banchi <mk.banchi@gmail.com>
Tue, 31 Aug 2010 22:30:31 +0200
changeset 6599 8c1a255c05a3
parent 6598 7459bc9f1a3b
child 6600 e438f9b17c66
Rename MacLow::RxCompleteBufferedPacket to a more appropriate name
src/devices/wifi/mac-low.cc
src/devices/wifi/mac-low.h
--- a/src/devices/wifi/mac-low.cc	Wed Sep 01 22:17:18 2010 -0700
+++ b/src/devices/wifi/mac-low.cc	Tue Aug 31 22:30:31 2010 +0200
@@ -811,7 +811,7 @@
               AgreementsI it = m_bAckAgreements.find (std::make_pair (hdr.GetAddr2 (), hdr.GetQosTid ()));
               RxCompleteBufferedPacketsWithSmallerSequence (it->second.first.GetStartingSequence (),
                                                             hdr.GetAddr2 (), hdr.GetQosTid ());
-              RxCompleteBufferedPackets (hdr.GetAddr2 (), hdr.GetQosTid ());
+              RxCompleteBufferedPacketsUntilFirstLost (hdr.GetAddr2 (), hdr.GetQosTid ());
               NS_ASSERT (m_sendAckEvent.IsExpired ());
               m_sendAckEvent = Simulator::Schedule (GetSifs (),
                                                     &MacLow::SendAckAfterData, this,
@@ -1563,7 +1563,7 @@
   if (it != m_bAckAgreements.end ())
     {
       RxCompleteBufferedPacketsWithSmallerSequence (it->second.first.GetStartingSequence (), originator, tid);
-      RxCompleteBufferedPackets (originator, tid);
+      RxCompleteBufferedPacketsUntilFirstLost (originator, tid);
       m_bAckAgreements.erase (it);
     }
 }
@@ -1629,7 +1629,7 @@
 }
 
 void
-MacLow::RxCompleteBufferedPackets (Mac48Address originator, uint8_t tid)
+MacLow::RxCompleteBufferedPacketsUntilFirstLost (Mac48Address originator, uint8_t tid)
 {
   AgreementsI it = m_bAckAgreements.find (std::make_pair (originator, tid));
   if (it != m_bAckAgreements.end ())
--- a/src/devices/wifi/mac-low.h	Wed Sep 01 22:17:18 2010 -0700
+++ b/src/devices/wifi/mac-low.h	Tue Aug 31 22:30:31 2010 +0200
@@ -549,7 +549,7 @@
    * agreement are forward up to WifiMac until there is an incomplete MSDU.
    * See section 9.10.4 in IEEE802.11 standard for more details.
    */
-  void RxCompleteBufferedPackets (Mac48Address originator, uint8_t tid);
+  void RxCompleteBufferedPacketsUntilFirstLost (Mac48Address originator, uint8_t tid);
   /* 
    * This method checks if exists a valid established block ack agreement. 
    * If there is, store the packet without pass it up to WifiMac. The packet is buffered