From 95153be77b11fbb974c37141981561874cc5befe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Deronne?= Date: Tue, 15 Nov 2022 22:51:48 +0100 Subject: [PATCH] wifi: Fix HE-SIG-B content channels for 2x996 tones RU --- src/wifi/model/wifi-tx-vector.cc | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/wifi/model/wifi-tx-vector.cc b/src/wifi/model/wifi-tx-vector.cc index 1c0d2d518..4f3b9ef23 100644 --- a/src/wifi/model/wifi-tx-vector.cc +++ b/src/wifi/model/wifi-tx-vector.cc @@ -672,10 +672,14 @@ WifiTxVector::GetContentChannelAllocation(uint8_t p20Index) const const auto& userInfo = GetHeMuUserInfo(staId); NS_ASSERT(ru == userInfo.ru); - if ((ruType == HeRu::RU_484_TONE) || (ruType == HeRu::RU_996_TONE)) + if ((ruType == HeRu::RU_484_TONE) || (ruType == HeRu::RU_996_TONE) || + (ruType == HeRu::RU_2x996_TONE)) { - channelAlloc[0].push_back(staId); - channelAlloc[1].push_back(staId); + for (auto i = 0; i < ((ruType == HeRu::RU_2x996_TONE) ? 2 : 1); ++i) + { + channelAlloc[0].push_back(staId); + channelAlloc[1].push_back(staId); + } continue; }