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

wifi: Allow sending BARs on any link when needed

Browse Source
This commit is contained in:
Stefano Avallone
2022-11-29 23:08:36 +01:00
committed by Stefano Avallone
parent 31604c0492
commit d76a53da60
2 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/wifi/model/block-ack-manager.cc
View File

@@ -557,7 +557,7 @@ BlockAckManager::NotifyDiscardedMpdu(Ptr<const WifiMpdu> mpdu)
return;
}
Mac48Address recipient = mpdu->GetHeader().GetAddr1();
Mac48Address recipient = mpdu->GetOriginal()->GetHeader().GetAddr1();
uint8_t tid = mpdu->GetHeader().GetQosTid();
auto it = m_originatorAgreements.find({recipient, tid});
if (it == m_originatorAgreements.end() || !it->second.first.IsEstablished())
@@ -606,8 +606,7 @@ BlockAckManager::NotifyDiscardedMpdu(Ptr<const WifiMpdu> mpdu)
WifiMacHeader hdr;
hdr.SetType(WIFI_MAC_CTL_BACKREQ);
hdr.SetAddr1(recipient);
hdr.SetAddr2(mpdu->GetHeader().GetAddr2());
hdr.SetAddr3(mpdu->GetHeader().GetAddr3());
hdr.SetAddr2(mpdu->GetOriginal()->GetHeader().GetAddr2());
hdr.SetDsNotTo();
hdr.SetDsNotFrom();
hdr.SetNoRetry();

18
src/wifi/model/ht/ht-frame-exchange-manager.cc
View File

@@ -1344,11 +1344,7 @@ HtFrameExchangeManager::MissedBlockAck(Ptr<WifiPsdu> psdu,
NS_LOG_FUNCTION(this << psdu << txVector << resetCw);
auto recipient = psdu->GetAddr1();
auto recipientMld = recipient;
if (auto optAddr = GetWifiRemoteStationManager()->GetMldAddress(recipient))
{
recipientMld = *optAddr;
}
auto recipientMld = GetWifiRemoteStationManager()->GetMldAddress(recipient).value_or(recipient);
bool isBar;
uint8_t tid;
@@ -1378,6 +1374,16 @@ HtFrameExchangeManager::MissedBlockAck(Ptr<WifiPsdu> psdu,
if (GetBaManager(tid)->NeedBarRetransmission(tid, recipientMld))
{
NS_LOG_DEBUG("Missed Block Ack, transmit a BlockAckReq");
/**
* The BlockAckReq must be sent on the same link as the data frames to avoid issues.
* As an example, assume that an A-MPDU is sent on link 0, the BlockAck timer
* expires and the BlockAckReq is sent on another link (e.g., on link 1). When the
* originator processes the BlockAck response, it will not interpret a '0' in the
* bitmap corresponding to the transmitted MPDUs as a negative acknowledgment,
* because the BlockAck is received on a different link than the one on which the
* MPDUs are (still) inflight. Hence, such MPDUs stay inflight and are not
* retransmitted.
*/
if (isBar)
{
psdu->GetHeader(0).SetRetry();
@@ -1403,7 +1409,7 @@ HtFrameExchangeManager::MissedBlockAck(Ptr<WifiPsdu> psdu,
{
// schedule a BlockAckRequest to be sent only if there are data frames queued
// for this recipient
GetBaManager(tid)->AddToSendBarIfDataQueuedList(recipient, tid);
GetBaManager(tid)->AddToSendBarIfDataQueuedList(recipientMld, tid);
}
resetCw = true;
}