From d1a588d7ced9aa6e60628b5500faaf2a247aee50 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Deronne?= <sebastien.deronne@gmail.com>
Date: Tue, 18 Jul 2023 22:42:55 +0200
Subject: [PATCH] wifi: Peek MPDU from correct queue ID

---
 src/wifi/model/qos-txop.cc | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/wifi/model/qos-txop.cc b/src/wifi/model/qos-txop.cc
index 7c2b646a9..6dbe9ab27 100644
--- a/src/wifi/model/qos-txop.cc
+++ b/src/wifi/model/qos-txop.cc
@@ -388,7 +388,10 @@ QosTxop::PeekNextMpdu(uint8_t linkId, uint8_t tid, Mac48Address recipient, Ptr<c
         {
             return m_queue->PeekFirstAvailable(linkId, mpdu);
         }
-        WifiContainerQueueId queueId(WIFI_QOSDATA_QUEUE, WIFI_UNICAST, recipient, tid);
+        WifiContainerQueueId queueId(WIFI_QOSDATA_QUEUE,
+                                     recipient.IsGroup() ? WIFI_GROUPCAST : WIFI_UNICAST,
+                                     recipient,
+                                     tid);
         if (auto mask = m_mac->GetMacQueueScheduler()->GetQueueLinkMask(m_ac, queueId, linkId);
             mask && mask->none())
         {