wifi: No need to check if event is running to cancel it

schneiben · Dec 13, 2023 · ac1573c · ac1573c
1 parent 24d270d
commit ac1573c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 8 deletions.
diff --git a/src/wifi/model/phy-entity.cc b/src/wifi/model/phy-entity.cc
@@ -1125,10 +1125,7 @@ PhyEntity::CancelRunningEndPreambleDetectionEvents(bool clear /* = false */)
     NS_LOG_FUNCTION(this << clear);
     for (auto& endPreambleDetectionEvent : m_endPreambleDetectionEvents)
     {
-        if (endPreambleDetectionEvent.IsRunning())
-        {
-            endPreambleDetectionEvent.Cancel();
-        }
+        endPreambleDetectionEvent.Cancel();
     }
     if (clear)
     {

diff --git a/src/wifi/model/wifi-phy.cc b/src/wifi/model/wifi-phy.cc
@@ -2138,10 +2138,7 @@ WifiPhy::AbortCurrentReception(WifiPhyRxfailureReason reason)
         {
             phyEntity.second->CancelAllEvents();
         }
-        if (m_endPhyRxEvent.IsRunning())
-        {
-            m_endPhyRxEvent.Cancel();
-        }
+        m_endPhyRxEvent.Cancel();
         m_interference->NotifyRxEnd(Simulator::Now(), GetCurrentFrequencyRange());
         if (!m_currentEvent)
         {