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

wifi: Remove unneeded calls to ScheduleNow in EMLSR manager

Browse Source
This commit is contained in:
Stefano Avallone
2024-10-18 13:35:28 +02:00
parent 85be630add
commit aa1bd1005e
1 changed files with 15 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/wifi/model/eht/emlsr-manager.cc
View File

@@ -732,18 +732,16 @@ EmlsrManager::NotifyTxopEnd(uint8_t linkId, bool ulTxopNotStarted, bool ongoingD
DoNotifyTxopEnd(linkId);
Simulator::ScheduleNow([=, this]() {
// unblock transmissions and resume medium access on other EMLSR links
std::set<uint8_t> linkIds;
for (auto id : m_staMac->GetLinkIds())
// unblock transmissions and resume medium access on other EMLSR links
std::set<uint8_t> linkIds;
for (auto id : m_staMac->GetLinkIds())
{
if ((id != linkId) && m_staMac->IsEmlsrLink(id))
{
if ((id != linkId) && m_staMac->IsEmlsrLink(id))
{
linkIds.insert(id);
}
linkIds.insert(id);
}
m_staMac->UnblockTxOnLink(linkIds, WifiQueueBlockedReason::USING_OTHER_EMLSR_LINK);
});
}
m_staMac->UnblockTxOnLink(linkIds, WifiQueueBlockedReason::USING_OTHER_EMLSR_LINK);
}
void
@@ -1282,15 +1280,13 @@ EmlsrManager::ApplyMaxChannelWidthAndModClassOnAuxPhys()
// reset all backoffs (so that access timeout is also cancelled) when the channel switch
// starts and request channel access (if needed) when the channel switch ends.
cam->ResetAllBackoffs();
Simulator::ScheduleNow([=, this]() {
for (const auto& [acIndex, ac] : wifiAcList)
{
m_staMac->GetQosTxop(acIndex)->StartAccessAfterEvent(
linkId,
Txop::DIDNT_HAVE_FRAMES_TO_TRANSMIT,
Txop::CHECK_MEDIUM_BUSY);
}
});
for (const auto& [acIndex, ac] : wifiAcList)
{
m_staMac->GetQosTxop(acIndex)->StartAccessAfterEvent(
linkId,
Txop::DIDNT_HAVE_FRAMES_TO_TRANSMIT,
Txop::CHECK_MEDIUM_BUSY);
}
}
}