From 6f34d6e0d60df288b2036cd5e07e65378a950e9c Mon Sep 17 00:00:00 2001
From: Stefano Avallone <stavallo@unina.it>
Date: Wed, 18 May 2022 16:09:33 +0200
Subject: [PATCH] wifi: Remove useless ChannelAccessManager::MostRecent()

---
 src/wifi/model/channel-access-manager.cc | 43 ++++++++++--------------
 src/wifi/model/channel-access-manager.h  |  8 -----
 2 files changed, 18 insertions(+), 33 deletions(-)

diff --git a/src/wifi/model/channel-access-manager.cc b/src/wifi/model/channel-access-manager.cc
index 6aceb5deb..d89eb536e 100644
--- a/src/wifi/model/channel-access-manager.cc
+++ b/src/wifi/model/channel-access-manager.cc
@@ -192,13 +192,6 @@ ChannelAccessManager::Add (Ptr<Txop> txop)
   m_txops.push_back (txop);
 }
 
-Time
-ChannelAccessManager::MostRecent (std::initializer_list<Time> list) const
-{
-  NS_ASSERT (list.size () > 0);
-  return *std::max_element (list.begin (), list.end ());
-}
-
 void
 ChannelAccessManager::InitLastBusyStructs (void)
 {
@@ -442,24 +435,24 @@ ChannelAccessManager::GetAccessGrantStart (bool ignoreNav) const
   Time accessGrantedStart;
   if (ignoreNav)
     {
-      accessGrantedStart = MostRecent ({rxAccessStart,
-                                        busyAccessStart,
-                                        txAccessStart,
-                                        ackTimeoutAccessStart,
-                                        ctsTimeoutAccessStart,
-                                        switchingAccessStart}
-                                       );
+      accessGrantedStart = std::max ({rxAccessStart,
+                                      busyAccessStart,
+                                      txAccessStart,
+                                      ackTimeoutAccessStart,
+                                      ctsTimeoutAccessStart,
+                                      switchingAccessStart}
+                                     );
     }
   else
     {
-      accessGrantedStart = MostRecent ({rxAccessStart,
-                                        busyAccessStart,
-                                        txAccessStart,
-                                        navAccessStart,
-                                        ackTimeoutAccessStart,
-                                        ctsTimeoutAccessStart,
-                                        switchingAccessStart}
-                                       );
+      accessGrantedStart = std::max ({rxAccessStart,
+                                      busyAccessStart,
+                                      txAccessStart,
+                                      navAccessStart,
+                                      ackTimeoutAccessStart,
+                                      ctsTimeoutAccessStart,
+                                      switchingAccessStart}
+                                     );
     }
   NS_LOG_INFO ("access grant start=" << accessGrantedStart <<
                ", rx access start=" << rxAccessStart <<
@@ -473,8 +466,8 @@ Time
 ChannelAccessManager::GetBackoffStartFor (Ptr<Txop> txop)
 {
   NS_LOG_FUNCTION (this << txop);
-  Time mostRecentEvent = MostRecent ({txop->GetBackoffStart (),
-                                     GetAccessGrantStart () + (txop->GetAifsn () * GetSlot ())});
+  Time mostRecentEvent = std::max ({txop->GetBackoffStart (),
+                                    GetAccessGrantStart () + (txop->GetAifsn () * GetSlot ())});
   NS_LOG_DEBUG ("Backoff start: " << mostRecentEvent.As (Time::US));
 
   return mostRecentEvent;
@@ -866,7 +859,7 @@ void
 ChannelAccessManager::UpdateLastIdlePeriod (void)
 {
   NS_LOG_FUNCTION (this);
-  Time idleStart = MostRecent ({m_lastTxEnd, m_lastRx.end, m_lastSwitchingEnd});
+  Time idleStart = std::max ({m_lastTxEnd, m_lastRx.end, m_lastSwitchingEnd});
   Time now = Simulator::Now ();
 
   if (idleStart >= now)
diff --git a/src/wifi/model/channel-access-manager.h b/src/wifi/model/channel-access-manager.h
index 1c4061ad6..8cfb1e5aa 100644
--- a/src/wifi/model/channel-access-manager.h
+++ b/src/wifi/model/channel-access-manager.h
@@ -259,14 +259,6 @@ private:
    * Update backoff slots for all Txops.
    */
   void UpdateBackoff (void);
-  /**
-   * Return the most recent time.
-   *
-   * \param list the initializer list including the times to compare
-   *
-   * \return the most recent time
-   */
-  Time MostRecent (std::initializer_list<Time> list) const;
   /**
    * Return the time when the backoff procedure
    * started for the given Txop.