F5/unison
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename MacLow::RxCompleteBufferedPacket to a more appropriate name

Browse Source
This commit is contained in:
Mirko Banchi
2010-08-31 22:30:31 +02:00
parent de268675ab
commit 60bdd228ae
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/devices/wifi/mac-low.cc
View File

@@ -811,7 +811,7 @@ MacLow::ReceiveOk (Ptr<Packet> 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 ())

2
src/devices/wifi/mac-low.h
View File

@@ -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