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

wifi: Main PHY and aux PHY can switch immediately (no need to schedule)

Browse Source
This commit is contained in:
Stefano Avallone
2023-11-02 11:26:30 +01:00
committed by Stefano Avallone
parent e840a0220b
commit 98f27be294
1 changed files with 26 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -514,28 +514,26 @@ EmlsrManager::SwitchMainPhy(uint8_t linkId, bool noSwitchDelay)
"We should not ask the main PHY to switch channel while transmitting");
// request the main PHY to switch channel
Simulator::ScheduleNow([=, this]() {
auto delay = mainPhy->GetChannelSwitchDelay();
NS_ASSERT_MSG(noSwitchDelay || delay <= m_lastAdvTransitionDelay,
"Transition delay (" << m_lastAdvTransitionDelay.As(Time::US)
<< ") should exceed the channel switch delay ("
<< delay.As(Time::US) << ")");
if (noSwitchDelay)
{
mainPhy->SetAttribute("ChannelSwitchDelay", TimeValue(Seconds(0)));
}
mainPhy->SetOperatingChannel(newMainPhyChannel);
// restore previous channel switch delay
if (noSwitchDelay)
{
mainPhy->SetAttribute("ChannelSwitchDelay", TimeValue(delay));
}
// re-enable short time slot, if needed
if (m_staMac->GetWifiRemoteStationManager(linkId)->GetShortSlotTimeEnabled())
{
mainPhy->SetSlot(MicroSeconds(9));
}
});
auto delay = mainPhy->GetChannelSwitchDelay();
NS_ASSERT_MSG(noSwitchDelay || delay <= m_lastAdvTransitionDelay,
"Transition delay (" << m_lastAdvTransitionDelay.As(Time::US)
<< ") should exceed the channel switch delay ("
<< delay.As(Time::US) << ")");
if (noSwitchDelay)
{
mainPhy->SetAttribute("ChannelSwitchDelay", TimeValue(Seconds(0)));
}
mainPhy->SetOperatingChannel(newMainPhyChannel);
// restore previous channel switch delay
if (noSwitchDelay)
{
mainPhy->SetAttribute("ChannelSwitchDelay", TimeValue(delay));
}
// re-enable short time slot, if needed
if (m_staMac->GetWifiRemoteStationManager(linkId)->GetShortSlotTimeEnabled())
{
mainPhy->SetSlot(MicroSeconds(9));
}
SetCcaEdThresholdOnLinkSwitch(mainPhy, linkId);
NotifyMainPhySwitch(*currMainPhyLinkId, linkId);
@@ -557,14 +555,12 @@ EmlsrManager::SwitchAuxPhy(uint8_t currLinkId, uint8_t nextLinkId)
->GetChannelAccessManager(currLinkId)
->NotifySwitchingEmlsrLink(auxPhy, newAuxPhyChannel, nextLinkId);
Simulator::ScheduleNow([=, this]() {
auxPhy->SetOperatingChannel(newAuxPhyChannel);
// re-enable short time slot, if needed
if (m_staMac->GetWifiRemoteStationManager(nextLinkId)->GetShortSlotTimeEnabled())
{
auxPhy->SetSlot(MicroSeconds(9));
}
});
auxPhy->SetOperatingChannel(newAuxPhyChannel);
// re-enable short time slot, if needed
if (m_staMac->GetWifiRemoteStationManager(nextLinkId)->GetShortSlotTimeEnabled())
{
auxPhy->SetSlot(MicroSeconds(9));
}
SetCcaEdThresholdOnLinkSwitch(auxPhy, nextLinkId);
}