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

wifi: Move code to clear RX events to AbortCurrentReception function

Browse Source
This commit is contained in:
Sébastien Deronne
2023-11-12 10:33:55 +01:00
committed by Sébastien Deronne
parent 1c320d7d07
commit 959998752f
1 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/wifi/model/wifi-phy.cc
View File

@@ -1789,13 +1789,6 @@ WifiPhy::Send(WifiConstPsduMap psdus, const WifiTxVector& txVector)
AbortCurrentReception(RECEPTION_ABORTED_BY_TX);
}
for (auto& it : m_phyEntities)
{
it.second->CancelRunningEndPreambleDetectionEvents();
}
m_currentPreambleEvents.clear();
m_endPhyRxEvent.Cancel();
if (m_powerRestricted)
{
NS_LOG_DEBUG("Transmitting with power restriction for " << txDuration.As(Time::NS));
@@ -2146,12 +2139,20 @@ WifiPhy::AbortCurrentReception(WifiPhyRxfailureReason reason)
{
m_state->SwitchFromRxAbort(GetChannelWidth());
}
for (auto it = m_currentPreambleEvents.begin(); it != m_currentPreambleEvents.end(); ++it)
if (reason == RECEPTION_ABORTED_BY_TX)
{
if (it->second == m_currentEvent)
m_currentPreambleEvents.clear();
}
else
{
for (auto it = m_currentPreambleEvents.begin(); it != m_currentPreambleEvents.end();
++it)
{
it = m_currentPreambleEvents.erase(it);
break;
if (it->second == m_currentEvent)
{
it = m_currentPreambleEvents.erase(it);
break;
}
}
}
m_currentEvent = nullptr;