From 4a586f1ca9bb4b8d13c8727a1eba779886f8d4db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Deronne?= Date: Sun, 15 Sep 2024 13:17:32 +0200 Subject: [PATCH] wifi: Extend RU allocation to 9 bits --- src/wifi/model/eht/eht-ppdu.h | 4 ++-- src/wifi/model/wifi-tx-vector.h | 4 ++-- src/wifi/test/wifi-phy-ofdma-test.cc | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/wifi/model/eht/eht-ppdu.h b/src/wifi/model/eht/eht-ppdu.h index eae161c09..50b279bb0 100644 --- a/src/wifi/model/eht/eht-ppdu.h +++ b/src/wifi/model/eht/eht-ppdu.h @@ -106,7 +106,7 @@ class EhtPpdu : public HePpdu static std::pair GetNumRusPerEhtSigBContentChannel( MHz_u channelWidth, uint8_t ehtPpduType, - const std::vector& ruAllocation, + const RuAllocation& ruAllocation, bool compression, std::size_t numMuMimoUsers); @@ -131,7 +131,7 @@ class EhtPpdu : public HePpdu * \return field size in bytes */ static uint32_t GetEhtSigFieldSize(MHz_u channelWidth, - const std::vector& ruAllocation, + const RuAllocation& ruAllocation, uint8_t ehtPpduType, bool compression, std::size_t numMuMimoUsers); diff --git a/src/wifi/model/wifi-tx-vector.h b/src/wifi/model/wifi-tx-vector.h index b4f91549e..934560d0e 100644 --- a/src/wifi/model/wifi-tx-vector.h +++ b/src/wifi/model/wifi-tx-vector.h @@ -51,8 +51,8 @@ struct HeMuUserInfo bool operator!=(const HeMuUserInfo& other) const; }; -/// 8 bit RU_ALLOCATION per 20 MHz -using RuAllocation = std::vector; +/// 9 bits RU_ALLOCATION per 20 MHz +using RuAllocation = std::vector; /** * \ingroup wifi diff --git a/src/wifi/test/wifi-phy-ofdma-test.cc b/src/wifi/test/wifi-phy-ofdma-test.cc index b89dfbbe5..8f649eca2 100644 --- a/src/wifi/test/wifi-phy-ofdma-test.cc +++ b/src/wifi/test/wifi-phy-ofdma-test.cc @@ -1377,7 +1377,7 @@ TestDlOfdmaPhyPuncturing::SendMuPpdu(uint16_t rxStaId1, txVector.SetMode(HePhy::GetHeMcs9(), rxStaId2); txVector.SetNss(1, rxStaId2); - std::vector ruAlloc; + RuAllocation ruAlloc; if (puncturedSubchannels.empty()) { std::fill_n(std::back_inserter(ruAlloc), 4, 200);