wifi: (fixes #2925) Correct reported number of MPDUs when a block ack timeout event occurs

2018-06-05 22:19:08 +02:00
parent 536d7de036
commit b401974d28
2 changed files with 4 additions and 1 deletions
--- a/1
+++ b/1
@@ -40,6 +40,7 @@ Bugs fixed
 - Bug 2801 - FdNetDevice device MTU is not set correctly
 - Bug 2819 - FqCoDel handling of non-IP packets
 - Bug 2920 - wifi: Default MaxSlrc and fragmentation threshold values differ from standard
+- Bug 2925 - wifi: MinstrelHt provides strange results at low SNR with A-MPDU enabled

 Known issues
 ------------
--- a/src/wifi/model/mac-low.cc
+++ b/src/wifi/model/mac-low.cc
@@ -1541,8 +1541,10 @@ MacLow::BlockAckTimeout (void)
  m_currentTxop = 0;
  m_ampdu = false;
  uint8_t tid = GetTid (m_currentPacket, m_currentHdr);
+  AmpduTag ampdu;
+  m_currentPacket->RemovePacketTag (ampdu);
+  txop->MissedBlockAck (ampdu.GetRemainingNbOfMpdus() + 1);
  FlushAggregateQueue (tid);
-  txop->MissedBlockAck (static_cast<uint8_t> (m_aggregateQueue[tid]->GetNPackets()));
 }

 void