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

wifi: Handle case where aux PHY gets access on a link when main PHY completes switching

Browse Source
This commit is contained in:
Stefano Avallone
2025-03-17 10:14:11 +01:00
parent 259f260b5b
commit 230b50d225
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -901,32 +901,33 @@ AdvancedEmlsrManager::SwitchMainPhyIfTxopGainedByAuxPhy(uint8_t linkId, AcIndex
// case, do nothing because the main PHY will start a TXOP and at the end of such TXOP
// links will be unblocked and the channel access requested on all links
Time delay{};
std::optional<Time> delay;
if (m_ccaLastPifs.IsPending() || m_switchMainPhyBackEvent.IsPending())
{
delay = std::max(Simulator::GetDelayLeft(m_ccaLastPifs),
Simulator::GetDelayLeft(m_switchMainPhyBackEvent));
}
else if (mainPhy->IsStateSwitching() || mainPhy->IsStateCcaBusy() || mainPhy->IsStateRx())
else if (mainPhy->GetState()->GetLastTime(
{WifiPhyState::SWITCHING, WifiPhyState::CCA_BUSY, WifiPhyState::RX}) ==
Simulator::Now())
{
delay = mainPhy->GetDelayUntilIdle();
NS_ASSERT(delay.IsStrictlyPositive());
}
NS_LOG_DEBUG("Main PHY state is " << mainPhy->GetState()->GetState());
auto edca = GetStaMac()->GetQosTxop(aci);
edca->NotifyChannelReleased(linkId); // to set access to NOT_REQUESTED
if (delay.IsZero())
if (!delay.has_value())
{
NS_LOG_DEBUG("Do nothing");
return;
}
NS_LOG_DEBUG("Schedule channel access request on link "
<< +linkId << " at time " << (Simulator::Now() + delay).As(Time::NS));
Simulator::Schedule(delay, [=]() {
<< +linkId << " at time " << (Simulator::Now() + *delay).As(Time::NS));
Simulator::Schedule(*delay, [=]() {
edca->StartAccessAfterEvent(linkId,
Txop::DIDNT_HAVE_FRAMES_TO_TRANSMIT,
Txop::CHECK_MEDIUM_BUSY);