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

wifi: Do not consume a sequence number when an MSDU is not dequeued

Browse Source
This commit is contained in:
Stefano Avallone
2020-06-07 23:07:41 +02:00
committed by Tom Henderson
parent 4547326445
commit f7eb7dcfec
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/wifi/model/qos-txop.cc
View File

@@ -359,9 +359,7 @@ QosTxop::DequeuePeekedFrame (Ptr<const WifiMacQueueItem> peekedItem, WifiTxVecto
}
}
// the packet has been peeked from the EDCA queue.
uint16_t sequence = m_txMiddle->GetNextSequenceNumberFor (&peekedItem->GetHeader ());
// The packet has been peeked from the EDCA queue.
// If it is a QoS Data frame and it is not a broadcast frame, attempt A-MSDU
// aggregation if aggregate is true
if (peekedItem->GetHeader ().IsQosData ())
@@ -371,6 +369,8 @@ QosTxop::DequeuePeekedFrame (Ptr<const WifiMacQueueItem> peekedItem, WifiTxVecto
NS_ASSERT (testIt != m_queue->end () && (*testIt)->GetPacket () == peekedItem->GetPacket ());
uint16_t sequence = m_txMiddle->PeekNextSequenceNumberFor (&peekedItem->GetHeader ());
// check if the peeked packet is within the transmit window
if (GetBaAgreementEstablished (recipient, tid)
&& !IsInWindow (sequence, GetBaStartingSequence (recipient, tid), GetBaBufferSize (recipient, tid)))
@@ -402,8 +402,10 @@ QosTxop::DequeuePeekedFrame (Ptr<const WifiMacQueueItem> peekedItem, WifiTxVecto
NS_ASSERT (item != 0 && item->GetPacket () == peekedItem->GetPacket ());
}
// Assign a sequence number to the MSDU or A-MSDU dequeued from the EDCA queue
NS_ASSERT (item != 0);
// Assign a sequence number to the MSDU or A-MSDU dequeued from the EDCA queue
uint16_t sequence = m_txMiddle->GetNextSequenceNumberFor (&item->GetHeader ());
item->GetHeader ().SetSequenceNumber (sequence);
item->GetHeader ().SetFragmentNumber (0);
item->GetHeader ().SetNoMoreFragments ();