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

wifi: Reduce code duplication by calling WifiPhy::Reset

Browse Source
This commit is contained in:
Sébastien Deronne
2023-11-11 17:00:04 +01:00
committed by Sébastien Deronne
parent 884a3972a2
commit 06ae0752eb
1 changed files with 7 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -402,12 +402,9 @@ void
WifiPhy::DoDispose()
{
NS_LOG_FUNCTION(this);
m_endTxEvent.Cancel();
m_endPhyRxEvent.Cancel();
for (auto& phyEntity : m_phyEntities)
{
phyEntity.second->CancelAllEvents();
}
Reset();
m_device = nullptr;
m_mobility = nullptr;
m_frameCaptureModel = nullptr;
@@ -421,8 +418,6 @@ WifiPhy::DoDispose()
m_interference = nullptr;
m_random = nullptr;
m_state = nullptr;
m_currentEvent = nullptr;
m_currentPreambleEvents.clear();
for (auto& phyEntity : m_phyEntities)
{
@@ -1162,11 +1157,7 @@ WifiPhy::GetDelayUntilChannelSwitch()
break;
case WifiPhyState::CCA_BUSY:
case WifiPhyState::IDLE:
m_endPhyRxEvent.Cancel();
for (auto& phyEntity : m_phyEntities)
{
phyEntity.second->CancelAllEvents();
}
Reset();
break;
case WifiPhyState::SLEEP:
NS_LOG_DEBUG("channel switching ignored in sleep mode");
@@ -1383,12 +1374,7 @@ WifiPhy::SetOffMode()
NS_LOG_FUNCTION(this);
m_powerRestricted = false;
m_channelAccessRequested = false;
m_endPhyRxEvent.Cancel();
m_endTxEvent.Cancel();
for (auto& phyEntity : m_phyEntities)
{
phyEntity.second->CancelAllEvents();
}
Reset();
m_state->SwitchToOff();
}
@@ -2142,7 +2128,7 @@ WifiPhy::AbortCurrentReception(WifiPhyRxfailureReason reason)
}
if (reason == RECEPTION_ABORTED_BY_TX)
{
m_currentPreambleEvents.clear();
Reset();
}
else
{
@@ -2155,8 +2141,8 @@ WifiPhy::AbortCurrentReception(WifiPhyRxfailureReason reason)
break;
}
}
m_currentEvent = nullptr;
}
m_currentEvent = nullptr;
}
}