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

wifi: Set CCA-ED threshold when a PHY is connected to a link

Browse Source 
...rather than when it starts switching. Fixes cases in which the medium
sync delay timer is stopped during the link switch, i.e., when the main
PHY switches to the link of an aux PHY that is receiving a CTS in
response to an RTS (receiving the CTS terminates the medium sync delay
timer on the aux PHY link)
This commit is contained in:
Stefano Avallone
2025-02-04 12:07:03 +01:00
parent 0d075fe305
commit e0195af625
2 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -124,7 +124,6 @@ DefaultEmlsrManager::NotifyMainPhySwitch(std::optional<uint8_t> currLinkId,
// the Aux PHY is not actually switching (hence no switching delay)
GetStaMac()->NotifySwitchingEmlsrLink(m_auxPhyToReconnect, *currLinkId, Seconds(0));
SetCcaEdThresholdOnLinkSwitch(m_auxPhyToReconnect, *currLinkId);
}
// if currLinkId has no value, it means that the main PHY switch is interrupted, hence reset

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

@@ -243,6 +243,8 @@ EmlsrManager::EmlsrLinkSwitchCallback(uint8_t linkId, Ptr<WifiPhy> phy, bool con
return;
}
SetCcaEdThresholdOnLinkSwitch(phy, linkId);
Simulator::ScheduleNow([=, this]() {
// phy switched to operate on the link with ID equal to linkId
auto it = m_noPhySince.find(linkId);
@@ -848,8 +850,9 @@ EmlsrManager::SetCcaEdThresholdOnLinkSwitch(Ptr<WifiPhy> phy, uint8_t linkId)
if (auto statusIt = m_mediumSyncDelayStatus.find(linkId);
statusIt != m_mediumSyncDelayStatus.cend() && statusIt->second.timer.IsPending())
{
NS_LOG_DEBUG("Setting CCA ED threshold of PHY " << phy << " to " << +m_msdOfdmEdThreshold
<< " on link " << +linkId);
NS_LOG_DEBUG("Setting CCA ED threshold of PHY " << +phy->GetPhyId() << " to "
<< +m_msdOfdmEdThreshold << " on link "
<< +linkId);
// store the current CCA ED threshold in the m_prevCcaEdThreshold map, if not present
m_prevCcaEdThreshold.try_emplace(phy, phy->GetCcaEdThreshold());
@@ -860,8 +863,8 @@ EmlsrManager::SetCcaEdThresholdOnLinkSwitch(Ptr<WifiPhy> phy, uint8_t linkId)
else if (auto threshIt = m_prevCcaEdThreshold.find(phy);
threshIt != m_prevCcaEdThreshold.cend())
{
NS_LOG_DEBUG("Resetting CCA ED threshold of PHY " << phy << " to " << threshIt->second
<< " on link " << +linkId);
NS_LOG_DEBUG("Resetting CCA ED threshold of PHY "
<< +phy->GetPhyId() << " to " << threshIt->second << " on link " << +linkId);
phy->SetCcaEdThreshold(threshIt->second);
m_prevCcaEdThreshold.erase(threshIt);
}
@@ -968,7 +971,6 @@ EmlsrManager::SwitchMainPhy(uint8_t linkId,
m_mainPhySwitchInfo.to = linkId;
m_mainPhySwitchInfo.end = Simulator::Now() + timeToSwitchEnd;
SetCcaEdThresholdOnLinkSwitch(mainPhy, linkId);
NotifyMainPhySwitch(currMainPhyLinkId, linkId, auxPhy, timeToSwitchEnd);
}
@@ -1003,8 +1005,6 @@ EmlsrManager::SwitchAuxPhy(Ptr<WifiPhy> auxPhy, uint8_t currLinkId, uint8_t next
Txop::CHECK_MEDIUM_BUSY);
}
});
SetCcaEdThresholdOnLinkSwitch(auxPhy, nextLinkId);
}
void
@@ -1035,7 +1035,7 @@ EmlsrManager::StartMediumSyncDelayTimer(uint8_t linkId)
if (!it->second.timer.IsPending())
{
NS_LOG_DEBUG("Setting CCA ED threshold on link "
<< +linkId << " to " << +m_msdOfdmEdThreshold << " PHY " << phy);
<< +linkId << " to " << +m_msdOfdmEdThreshold << " PHY " << +phy->GetPhyId());
m_prevCcaEdThreshold[phy] = phy->GetCcaEdThreshold();
phy->SetCcaEdThreshold(m_msdOfdmEdThreshold);
}