wifi: Do not call SwitchMaybeToCcaBusy in wifiPhy::Reset function

This commit is contained in:
Sébastien Deronne
2023-11-25 14:27:10 +01:00
committed by Sébastien Deronne
parent 959998752f
commit 884a3972a2
2 changed files with 7 additions and 6 deletions

View File

@@ -1409,7 +1409,7 @@ WifiPhy::ResumeFromSleep()
case WifiPhyState::SLEEP: {
NS_LOG_DEBUG("resuming from sleep mode");
m_state->SwitchFromSleep();
SwitchMaybeToCcaBusy(nullptr);
SwitchMaybeToCcaBusy();
break;
}
default: {
@@ -1437,7 +1437,7 @@ WifiPhy::ResumeFromOff()
case WifiPhyState::OFF: {
NS_LOG_DEBUG("resuming from off mode");
m_state->SwitchFromOff();
SwitchMaybeToCcaBusy(nullptr);
SwitchMaybeToCcaBusy();
break;
}
default: {
@@ -1836,6 +1836,8 @@ WifiPhy::Send(WifiConstPsduMap psdus, const WifiTxVector& txVector)
m_powerRestricted = false;
Simulator::Schedule(txDuration, &WifiPhy::Reset, this);
Simulator::Schedule(txDuration, &WifiPhy::SwitchMaybeToCcaBusy, this, nullptr);
}
uint64_t
@@ -1863,7 +1865,6 @@ WifiPhy::Reset()
}
m_endPhyRxEvent.Cancel();
m_endTxEvent.Cancel();
SwitchMaybeToCcaBusy(nullptr);
}
void
@@ -1885,7 +1886,7 @@ WifiPhy::StartReceivePreamble(Ptr<const WifiPpdu> ppdu,
// structure)
NS_LOG_DEBUG("Unsupported modulation received (" << modulation << "), consider as noise");
m_interference->Add(ppdu, rxDuration, rxPowersW);
SwitchMaybeToCcaBusy(nullptr);
SwitchMaybeToCcaBusy();
}
}
@@ -2104,7 +2105,7 @@ WifiPhy::GetLastRxEndTime() const
}
void
WifiPhy::SwitchMaybeToCcaBusy(const Ptr<const WifiPpdu> ppdu)
WifiPhy::SwitchMaybeToCcaBusy(const Ptr<const WifiPpdu> ppdu /* = nullptr */)
{
NS_LOG_FUNCTION(this);
GetLatestPhyEntity()->SwitchMaybeToCcaBusy(ppdu);

View File

@@ -1237,7 +1237,7 @@ class WifiPhy : public Object
*
* \param ppdu the incoming PPDU or nullptr for any signal
*/
void SwitchMaybeToCcaBusy(const Ptr<const WifiPpdu> ppdu);
void SwitchMaybeToCcaBusy(const Ptr<const WifiPpdu> ppdu = nullptr);
/**
* Notify PHY state helper to switch to CCA busy state,
*