From 2a75e50f532ab4c149fe08f0631adde9832f4aa8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Deronne?= <sebastien.deronne@gmail.com>
Date: Mon, 13 Mar 2023 18:30:27 +0100
Subject: [PATCH] wifi: Fix UID used in an MU-CTS trigger response on 2.4 GHz
 links

---
 src/wifi/model/non-ht/erp-ofdm-phy.cc | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/wifi/model/non-ht/erp-ofdm-phy.cc b/src/wifi/model/non-ht/erp-ofdm-phy.cc
index 800a4d4a9..c7da35fcf 100644
--- a/src/wifi/model/non-ht/erp-ofdm-phy.cc
+++ b/src/wifi/model/non-ht/erp-ofdm-phy.cc
@@ -113,12 +113,14 @@ ErpOfdmPhy::BuildPpdu(const WifiConstPsduMap& psdus,
                       Time /* ppduDuration */)
 {
     NS_LOG_FUNCTION(this << psdus << txVector);
-    return Create<ErpOfdmPpdu>(psdus.begin()->second,
-                               txVector,
-                               m_wifiPhy->GetOperatingChannel().GetPrimaryChannelCenterFrequency(
-                                   txVector.GetChannelWidth()),
-                               m_wifiPhy->GetPhyBand(),
-                               ObtainNextUid(txVector));
+    return Create<ErpOfdmPpdu>(
+        psdus.begin()->second,
+        txVector,
+        m_wifiPhy->GetOperatingChannel().GetPrimaryChannelCenterFrequency(
+            txVector.GetChannelWidth()),
+        m_wifiPhy->GetPhyBand(),
+        m_wifiPhy->GetLatestPhyEntity()->ObtainNextUid(
+            txVector)); // use latest PHY entity to handle MU-RTS sent with non-HT rate
 }
 
 void