From 7ac82d461eca86681444e25acdeb64e03c7c264d Mon Sep 17 00:00:00 2001
From: Ivey <jivey9@stl.gtri.org>
Date: Fri, 6 Dec 2024 09:24:02 -0500
Subject: [PATCH] wifi: Return valid reference in
 WifiMacQueueSchedulerImpl::DoGetNext

---
 src/wifi/model/wifi-mac-queue-scheduler-impl.h | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/src/wifi/model/wifi-mac-queue-scheduler-impl.h b/src/wifi/model/wifi-mac-queue-scheduler-impl.h
index 9e06053e6..7597cbe18 100644
--- a/src/wifi/model/wifi-mac-queue-scheduler-impl.h
+++ b/src/wifi/model/wifi-mac-queue-scheduler-impl.h
@@ -642,19 +642,12 @@ WifiMacQueueSchedulerImpl<Priority, Compare>::DoGetNext(
                                                           : m_perAcInfo[ac].sortedQueues.begin());
                 continue;
             }
-            break;
+            return queueInfoPair.first;
         }
 
         sortedQueuesIt++;
     }
-
-    std::optional<WifiContainerQueueId> queueId;
-
-    if (sortedQueuesIt != m_perAcInfo[ac].sortedQueues.end())
-    {
-        queueId = sortedQueuesIt->second.get().first;
-    }
-    return queueId;
+    return {};
 }
 
 template <class Priority, class Compare>