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

wifi: AP MLDs do not wait until end of PSDU to block transmissions for EMLSR clients on other links

Browse Source 
Transmissions are blocked as soon as the first MPDU in the PSDU is received
This commit is contained in:
Stefano Avallone
2023-06-28 17:47:59 +02:00
committed by Stefano Avallone
parent 99cb2319cc
commit 91f781d842
1 changed files with 26 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
src/wifi/model/eht/eht-frame-exchange-manager.cc
View File

@@ -689,21 +689,6 @@ EhtFrameExchangeManager::PostProcessFrame(Ptr<const WifiPsdu> psdu, const WifiTx
m_phy->GetSifs() + m_phy->GetSlot() + MicroSeconds(RX_PHY_START_DELAY_USEC);
NS_LOG_DEBUG("Expected TXOP end=" << (Simulator::Now() + delay).As(Time::S));
m_ongoingTxopEnd = Simulator::Schedule(delay, &EhtFrameExchangeManager::TxopEnd, this);
// block transmissions on other links
auto mldAddress = GetWifiRemoteStationManager()->GetMldAddress(psdu->GetAddr2());
NS_ASSERT(mldAddress);
for (uint8_t linkId = 0; linkId < m_apMac->GetNLinks(); linkId++)
{
if (linkId != m_linkId &&
m_mac->GetWifiRemoteStationManager(linkId)->GetEmlsrEnabled(*mldAddress))
{
m_mac->BlockUnicastTxOnLinks(WifiQueueBlockedReason::USING_OTHER_EMLSR_LINK,
*mldAddress,
{linkId});
}
}
}
else
{
@@ -737,6 +722,32 @@ EhtFrameExchangeManager::ReceiveMpdu(Ptr<const WifiMpdu> mpdu,
const auto& hdr = mpdu->GetHeader();
if (m_apMac && GetWifiRemoteStationManager()->GetEmlsrEnabled(hdr.GetAddr2()))
{
// the AP MLD received an MPDU from an EMLSR client, which is now involved in an UL TXOP,
// hence block transmissions for this EMLSR client on other links
auto mldAddress = GetWifiRemoteStationManager()->GetMldAddress(hdr.GetAddr2());
NS_ASSERT(mldAddress);
for (uint8_t linkId = 0; linkId < m_apMac->GetNLinks(); linkId++)
{
if (linkId != m_linkId &&
m_mac->GetWifiRemoteStationManager(linkId)->GetEmlsrEnabled(*mldAddress))
{
m_mac->BlockUnicastTxOnLinks(WifiQueueBlockedReason::USING_OTHER_EMLSR_LINK,
*mldAddress,
{linkId});
}
}
// Make sure that transmissions for this EMLSR client are not blocked on this link
// (the AP MLD may have sent an ICF on another link right before receiving this MPDU,
// thus transmissions on this link may have been blocked)
m_mac->UnblockUnicastTxOnLinks(WifiQueueBlockedReason::USING_OTHER_EMLSR_LINK,
*mldAddress,
{m_linkId});
}
if (hdr.IsTrigger())
{
if (!m_staMac)