From 008792ce5cd5724b2230c2adca2eb5577d0538ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Deronne?= Date: Sat, 4 Nov 2017 09:14:57 +0100 Subject: [PATCH] wifi: cleanup duplicated setters in VhtCapabilities --- src/wifi/model/vht-capabilities.cc | 24 ------------------------ src/wifi/model/vht-capabilities.h | 17 ----------------- 2 files changed, 41 deletions(-) diff --git a/src/wifi/model/vht-capabilities.cc b/src/wifi/model/vht-capabilities.cc index 0574862a1..c1acba038 100644 --- a/src/wifi/model/vht-capabilities.cc +++ b/src/wifi/model/vht-capabilities.cc @@ -255,18 +255,6 @@ VhtCapabilities::SetMaxAmpduLengthExponent (uint8_t exponent) m_maxAmpduLengthExponent = exponent; } -void -VhtCapabilities::SetRxMcsMap (uint16_t map) -{ - //Set each element in the map accoriding to the 2 bits representing it page 98 in the 11ac standard - uint8_t n; - for (uint8_t i = 0; i < 8; i++) - { - n = i * 2; - m_rxMcsMap[i] = (map >> n) & 0x03; - } -} - void VhtCapabilities::SetRxMcsMap (uint8_t mcs, uint8_t nss) { @@ -275,18 +263,6 @@ VhtCapabilities::SetRxMcsMap (uint8_t mcs, uint8_t nss) m_rxMcsMap[nss - 1] = mcs - 7; //1 = MCS 8; 2 = MCS 9 } -void -VhtCapabilities::SetTxMcsMap (uint16_t map) -{ - //Set each element in the map accoriding to the 2 bits representing it page 98 in the 11ac standard - uint8_t n; - for (uint8_t i = 0; i < 8; i++) - { - n = i * 2; - m_txMcsMap[i] = (map >> n) & 0x03; - } -} - void VhtCapabilities::SetTxMcsMap (uint8_t mcs, uint8_t nss) { diff --git a/src/wifi/model/vht-capabilities.h b/src/wifi/model/vht-capabilities.h index 6577a4c6b..890129d96 100644 --- a/src/wifi/model/vht-capabilities.h +++ b/src/wifi/model/vht-capabilities.h @@ -195,28 +195,11 @@ public: */ uint8_t GetMaxAmpduLengthExponent () const; - // MCS and NSS field information - // For each value of NSS ranging from 1 to 8, we need to encode two bits. - // The value 0 indicates that the maximum MCS for that spatial stream is 7. - // The value 1 indicates that the maximum MCS for that spatial stream is 8. - // The value 2 indicates that the maximum MCS for that spatial stream is 9. - // - // The maps may be set all at once by passing in a 16-bit field corresponding - // to the above, or incrementally for each NSS separately, where the - // MCS value must be in the range 7-9. - /** - * \param map The 16-bit encoding of Max MCS for each of 8 spatial streams - */ - void SetRxMcsMap (uint16_t map); /** * \param mcs Max MCS value (between 7 and 9) * \param nss Spatial stream for which the Max MCS value is being set */ void SetRxMcsMap (uint8_t mcs, uint8_t nss); - /** - * \param map The 16-bit encoding of Max MCS for each of 8 spatial streams - */ - void SetTxMcsMap (uint16_t map); /** * \param mcs Max MCS value (between 7 and 9) * \param nss Spatial stream for which the Max MCS value is being set