From 60bdd228aed6c87f91cd5eb50323cf1521f544ee Mon Sep 17 00:00:00 2001 From: Mirko Banchi Date: Tue, 31 Aug 2010 22:30:31 +0200 Subject: [PATCH] Rename MacLow::RxCompleteBufferedPacket to a more appropriate name --- src/devices/wifi/mac-low.cc | 6 +++--- src/devices/wifi/mac-low.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/devices/wifi/mac-low.cc b/src/devices/wifi/mac-low.cc index 0199e4787..c5b3582fb 100644 --- a/src/devices/wifi/mac-low.cc +++ b/src/devices/wifi/mac-low.cc @@ -811,7 +811,7 @@ MacLow::ReceiveOk (Ptr packet, double rxSnr, WifiMode txMode, WifiPreamb 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 @@ MacLow::DestroyBlockAckAgreement (Mac48Address originator, uint8_t tid) 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 @@ MacLow::RxCompleteBufferedPacketsWithSmallerSequence (uint16_t seq, Mac48Address } 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 ()) diff --git a/src/devices/wifi/mac-low.h b/src/devices/wifi/mac-low.h index f072e88d7..d232dec73 100644 --- a/src/devices/wifi/mac-low.h +++ b/src/devices/wifi/mac-low.h @@ -549,7 +549,7 @@ private: * 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