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

wifi: Do not switch main PHY if aux PHY CCA is not used and switch back delay < PIFS

Browse Source
This commit is contained in:
Stefano Avallone
2025-02-17 10:27:52 +01:00
parent d44a8a0baf
commit f750cf045f
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -640,7 +640,14 @@ AdvancedEmlsrManager::RequestMainPhyToSwitch(uint8_t linkId, AcIndex aci, const
GetChannelForMainPhy(linkId).GetTotalWidth()))
{
// cannot use aux PHY CCA
minDelay += GetStaMac()->GetWifiPhy(linkId)->GetPifs();
const auto pifs = GetStaMac()->GetWifiPhy(linkId)->GetPifs();
if (m_switchMainPhyBackDelay < pifs)
{
NS_LOG_DEBUG(
"Main PHY has to perform CCA but switch main PHY back delay is less than PIFS");
return false;
}
minDelay += pifs;
}
minDelay = std::max(delay, minDelay);

3
src/wifi/test/wifi-emlsr-test.cc
View File

@@ -2732,8 +2732,9 @@ EmlsrUlTxopTest::DoSetup()
UintegerValue(m_auxPhyChannelWidth));
Config::SetDefault("ns3::DefaultEmlsrManager::SwitchAuxPhy", BooleanValue(false));
Config::SetDefault("ns3::AdvancedEmlsrManager::UseAuxPhyCca", BooleanValue(m_useAuxPhyCca));
// switch main PHY back delay should be at least a PIFS for the switch to occur
Config::SetDefault("ns3::AdvancedEmlsrManager::SwitchMainPhyBackDelay",
TimeValue(MilliSeconds(m_switchMainPhyBackDelayTimeout ? 2 : 0)));
TimeValue(MicroSeconds(m_switchMainPhyBackDelayTimeout ? 2000 : 30)));
Config::SetDefault("ns3::EhtConfiguration::MediumSyncDuration",
TimeValue(m_mediumSyncDuration));
Config::SetDefault("ns3::EhtConfiguration::MsdMaxNTxops", UintegerValue(m_msdMaxNTxops));