From 18506bf1b7e79f9ab28e30fd8121df0ef25058e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Deronne?= Date: Thu, 5 Apr 2018 22:50:07 +0200 Subject: [PATCH] wifi: Fix valgrind errors --- src/wifi/model/wifi-phy.cc | 3 +++ src/wifi/model/wifi-phy.h | 22 +++++++++++----------- 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/src/wifi/model/wifi-phy.cc b/src/wifi/model/wifi-phy.cc index 41124ceaf..29186e3d1 100644 --- a/src/wifi/model/wifi-phy.cc +++ b/src/wifi/model/wifi-phy.cc @@ -357,6 +357,9 @@ WifiPhy::WifiPhy () m_channelCenterFrequency (0), m_initialFrequency (0), m_frequencyChannelNumberInitialized (false), + m_channelWidth (0), + m_txSpatialStreams (0), + m_rxSpatialStreams (0), m_channelNumber (0), m_initialChannelNumber (0), m_totalAmpduSize (0), diff --git a/src/wifi/model/wifi-phy.h b/src/wifi/model/wifi-phy.h index 66c7bda58..fe154677d 100644 --- a/src/wifi/model/wifi-phy.h +++ b/src/wifi/model/wifi-phy.h @@ -1772,14 +1772,14 @@ private: std::vector m_bssMembershipSelectorSet; //!< the BSS membership selector set - WifiPhyStandard m_standard; //!< WifiPhyStandard - bool m_isConstructed; //!< true when ready to set frequency - uint16_t m_channelCenterFrequency; //!< Center frequency in MHz - uint16_t m_initialFrequency; //!< Store frequency until initialization + WifiPhyStandard m_standard; //!< WifiPhyStandard + bool m_isConstructed; //!< true when ready to set frequency + uint16_t m_channelCenterFrequency; //!< Center frequency in MHz + uint16_t m_initialFrequency; //!< Store frequency until initialization bool m_frequencyChannelNumberInitialized; //!< Store initialization state - uint8_t m_channelWidth; //!< Channel width + uint8_t m_channelWidth; //!< Channel width - double m_edThresholdW; //!< Energy detection threshold in watts + double m_edThresholdW; //!< Energy detection threshold in watts double m_ccaMode1ThresholdW; //!< Clear channel assessment (CCA) threshold in watts double m_txGainDb; //!< Transmission gain (dB) double m_rxGainDb; //!< Reception gain (dB) @@ -1787,11 +1787,11 @@ private: double m_txPowerEndDbm; //!< Maximum transmission power (dBm) uint8_t m_nTxPower; //!< Number of available transmission power levels - bool m_ldpc; //!< Flag if LDPC is used - bool m_stbc; //!< Flag if STBC is used - bool m_greenfield; //!< Flag if GreenField format is supported - bool m_shortGuardInterval; //!< Flag if HT/VHT short guard interval is supported - bool m_shortPreamble; //!< Flag if short PLCP preamble is supported + bool m_ldpc; //!< Flag if LDPC is used + bool m_stbc; //!< Flag if STBC is used + bool m_greenfield; //!< Flag if GreenField format is supported + bool m_shortGuardInterval; //!< Flag if HT/VHT short guard interval is supported + bool m_shortPreamble; //!< Flag if short PLCP preamble is supported Time m_guardInterval; //!< Supported HE guard interval