diff --git a/src/wifi/model/aparf-wifi-manager.cc b/src/wifi/model/aparf-wifi-manager.cc index 36f179532..b2eb99b35 100644 --- a/src/wifi/model/aparf-wifi-manager.cc +++ b/src/wifi/model/aparf-wifi-manager.cc @@ -86,12 +86,12 @@ AparfWifiManager::GetTypeId (void) "Step size for decrement the power.", UintegerValue (1), MakeUintegerAccessor (&AparfWifiManager::m_powerDec), - MakeUintegerChecker ()) + MakeUintegerChecker ()) .AddAttribute ("PowerIncrementStep", "Step size for increment the power.", UintegerValue (1), MakeUintegerAccessor (&AparfWifiManager::m_powerInc), - MakeUintegerChecker ()) + MakeUintegerChecker ()) .AddAttribute ("RateDecrementStep", "Step size for decrement the rate.", UintegerValue (1), diff --git a/src/wifi/model/aparf-wifi-manager.h b/src/wifi/model/aparf-wifi-manager.h index 39b632626..aa2e4a872 100644 --- a/src/wifi/model/aparf-wifi-manager.h +++ b/src/wifi/model/aparf-wifi-manager.h @@ -97,8 +97,8 @@ private: uint32_t m_succesMax2; //!< The minimum number of successful transmissions in \"Low\" state to try a new power or rate. uint32_t m_failMax; //!< The minimum number of failed transmissions to try a new power or rate. uint32_t m_powerMax; //!< The maximum number of power changes. - uint32_t m_powerInc; //!< Step size for increment the power. - uint32_t m_powerDec; //!< Step size for decrement the power. + uint8_t m_powerInc; //!< Step size for increment the power. + uint8_t m_powerDec; //!< Step size for decrement the power. uint32_t m_rateInc; //!< Step size for increment the rate. uint32_t m_rateDec; //!< Step size for decrement the rate. @@ -107,12 +107,12 @@ private: * Differently form rate, power levels do not depend on the remote station. * The levels depend only on the physical layer of the device. */ - uint32_t m_minPower; + uint8_t m_minPower; /** * Maximal power level. */ - uint32_t m_maxPower; + uint8_t m_maxPower; /** * The trace source fired when the transmission power changes. diff --git a/src/wifi/model/minstrel-wifi-manager.cc b/src/wifi/model/minstrel-wifi-manager.cc index 727a9ba4c..6efbc43e9 100644 --- a/src/wifi/model/minstrel-wifi-manager.cc +++ b/src/wifi/model/minstrel-wifi-manager.cc @@ -1070,7 +1070,7 @@ MinstrelWifiManager::PrintTable (MinstrelWifiRemoteStation *station) station->m_statsFile << ' '; } - float tmpTh = rate.throughput / 100000.0; + float tmpTh = rate.throughput / 100000.0f; station->m_statsFile << " " << std::setw (17) << GetSupported (station, i) << " " << std::setw (2) << i << " " << diff --git a/src/wifi/model/parf-wifi-manager.h b/src/wifi/model/parf-wifi-manager.h index bd0a83d31..f9e8a32f5 100644 --- a/src/wifi/model/parf-wifi-manager.h +++ b/src/wifi/model/parf-wifi-manager.h @@ -89,12 +89,12 @@ private: * In contrast to rate, power levels do not depend on the remote station. * The levels depend only on the physical layer of the device. */ - uint32_t m_minPower; + uint8_t m_minPower; /** * Maximal power level. */ - uint32_t m_maxPower; + uint8_t m_maxPower; /** * The trace source fired when the transmission power changes. diff --git a/src/wifi/model/rrpaa-wifi-manager.h b/src/wifi/model/rrpaa-wifi-manager.h index 06f78f8da..82a9bb79d 100644 --- a/src/wifi/model/rrpaa-wifi-manager.h +++ b/src/wifi/model/rrpaa-wifi-manager.h @@ -218,9 +218,9 @@ private: * Differently form rate, power levels do not depend on the remote station. * The levels depend only on the physical layer of the device. */ - uint32_t m_minPowerLevel; //!< Minimal power level. - uint32_t m_maxPowerLevel; //!< Maximal power level. - uint32_t m_nPowerLevels; //!< Number of power levels. + uint8_t m_minPowerLevel; //!< Minimal power level. + uint8_t m_maxPowerLevel; //!< Maximal power level. + uint8_t m_nPowerLevels; //!< Number of power levels. /** * The trace source fired when the transmission power change