F5/unison
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

wifi: Use RuAllocation alias instead of std::vector<uint8_t>

Browse Source
This commit is contained in:
Sébastien Deronne
2023-05-02 20:46:20 +02:00
committed by Sebastien Deronne
parent ba7930d397
commit 64a2970a60
3 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/wifi/model/eht/eht-ppdu.cc
View File

@@ -112,7 +112,7 @@ EhtPpdu::SetTxVectorFromPhyHeaders(WifiTxVector& txVector,
std::pair<std::size_t, std::size_t>
EhtPpdu::GetNumRusPerEhtSigBContentChannel(uint16_t channelWidth,
uint8_t ehtPpduType,
const std::vector<uint8_t>& ruAllocation)
const RuAllocation& ruAllocation)
{
if (ehtPpduType == 1)
{

3
src/wifi/model/he/he-ppdu.cc
View File

@@ -429,8 +429,7 @@ HePpdu::UpdateTxVectorForUlMu(const std::optional<WifiTxVector>& trigVector) con
}
std::pair<std::size_t, std::size_t>
HePpdu::GetNumRusPerHeSigBContentChannel(uint16_t channelWidth,
const std::vector<uint8_t>& ruAllocation)
HePpdu::GetNumRusPerHeSigBContentChannel(uint16_t channelWidth, const RuAllocation& ruAllocation)
{
// MU-MIMO is not handled for now, i.e. one station per RU
NS_ASSERT_MSG(!ruAllocation.empty(), "RU allocation is not set");

5
src/wifi/model/he/he-ppdu.h
View File

@@ -309,7 +309,7 @@ class HePpdu : public OfdmPpdu
*/
static std::pair<std::size_t, std::size_t> GetNumRusPerHeSigBContentChannel(
uint16_t channelWidth,
const std::vector<uint8_t>& ruAllocation);
const RuAllocation& ruAllocation);
/**
* Get variable length HE SIG-B field size
@@ -317,8 +317,7 @@ class HePpdu : public OfdmPpdu
* \param ruAllocation 8 bit RU_ALLOCATION per 20 MHz
* \return field size in bytes
*/
static uint32_t GetSigBFieldSize(uint16_t channelWidth,
const std::vector<uint8_t>& ruAllocation);
static uint32_t GetSigBFieldSize(uint16_t channelWidth, const RuAllocation& ruAllocation);
protected:
/**