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

wifi: Fix typos in HeOperation IE

Browse Source
This commit is contained in:
Sébastien Deronne
2017-12-08 20:50:52 +01:00
parent f22a8c2c39
commit 6a09fe0da9
2 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/wifi/model/he-operation.cc
View File

@@ -23,14 +23,14 @@
namespace ns3 {
HeOperation::HeOperation ()
: m_bsssColor (0),
: m_bssColor (0),
m_defaultPEDuration (0),
m_twtRequired (0),
m_heDurationBasedRtsThreshold (0),
m_partialBsssColor (0),
m_partialBssColor (0),
m_maxBssidIndicator (0),
m_txBssidIndicator (0),
m_bsssColorDisabled (0),
m_bssColorDisabled (0),
m_dualBeacon (0),
m_basicHeMcsAndNssSet (0),
m_heSupported (0)
@@ -60,14 +60,14 @@ HeOperation::GetInformationFieldSize () const
void
HeOperation::SetHeOperationParameters (uint32_t ctrl)
{
m_bsssColor = ctrl & 0x3f;
m_bssColor = ctrl & 0x3f;
m_defaultPEDuration = (ctrl >> 6) & 0x07;
m_twtRequired = (ctrl >> 9) & 0x01;
m_heDurationBasedRtsThreshold = (ctrl >> 10) & 0x03ff;
m_partialBsssColor = (ctrl >> 20) & 0x01;
m_partialBssColor = (ctrl >> 20) & 0x01;
m_maxBssidIndicator = (ctrl >> 21) & 0xff;
m_txBssidIndicator = (ctrl >> 29) & 0x01;
m_bsssColorDisabled = (ctrl >> 30) & 0x01;
m_bssColorDisabled = (ctrl >> 30) & 0x01;
m_dualBeacon = (ctrl >> 31) & 0x01;
}
@@ -75,14 +75,14 @@ uint32_t
HeOperation::GetHeOperationParameters () const
{
uint32_t val = 0;
val |= m_bsssColor & 0x3f;
val |= m_bssColor & 0x3f;
val |= (m_defaultPEDuration & 0x07) << 6;
val |= (m_twtRequired & 0x01) << 9;
val |= (m_heDurationBasedRtsThreshold & 0x03ff) << 10;
val |= (m_partialBsssColor & 0x01) << 20;
val |= (m_partialBssColor & 0x01) << 20;
val |= (m_maxBssidIndicator & 0xff) << 21;
val |= (m_txBssidIndicator & 0x01) << 29;
val |= (m_bsssColorDisabled & 0x01) << 30;
val |= (m_bssColorDisabled & 0x01) << 30;
val |= (m_dualBeacon & 0x01) << 31;
return val;
}

8
src/wifi/model/he-operation.h
View File

@@ -120,15 +120,15 @@ public:
private:
//HE Operation Parameters fields
uint8_t m_bsssColor; //!< BSS color
uint8_t m_bssColor; //!< BSS color
uint8_t m_defaultPEDuration; //!< default PE duration
uint8_t m_twtRequired; //!< TWT required
uint16_t m_heDurationBasedRtsThreshold; //!< HE duration based RTS threshold
uint8_t m_partialBsssColor; //!< partial BSS color
uint8_t m_partialBssColor; //!< partial BSS color
uint8_t m_maxBssidIndicator; //!< max BSSID indicator
uint8_t m_txBssidIndicator; //!< TX BSSID indicator
uint8_t m_bsssColorDisabled; //!< BSS color disabled
uint8_t m_dualBeacon; //!< BSS color disabled
uint8_t m_bssColorDisabled; //!< BSS color disabled
uint8_t m_dualBeacon; //!< Dual Beacon
//Basic HE-MCS and NSS Set
uint32_t m_basicHeMcsAndNssSet; ///< basic HE MCS NSS set