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

wifi: Get rid of unused retries parameter in WifiTxVector

Browse Source
This commit is contained in:
Sébastien Deronne
2018-02-27 20:25:59 +01:00
parent cb02bea0ae
commit a1a1a5990f
19 changed files with 30 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/wifi/model/aarf-wifi-manager.cc
View File

@@ -250,7 +250,7 @@ AarfWifiManager::DoGetDataTxVector (WifiRemoteStation *st)
NS_LOG_DEBUG ("New datarate: " << mode.GetDataRate (channelWidth));
m_currentRate = mode.GetDataRate (channelWidth);
}
return WifiTxVector (mode, GetDefaultTxPowerLevel (), GetLongRetryCount (station), GetPreambleForTransmission (mode, GetAddress (station)), 800, 1, 1, 0, channelWidth, GetAggregation (station), false);
return WifiTxVector (mode, GetDefaultTxPowerLevel (), GetPreambleForTransmission (mode, GetAddress (station)), 800, 1, 1, 0, channelWidth, GetAggregation (station), false);
}
WifiTxVector
@@ -276,7 +276,7 @@ AarfWifiManager::DoGetRtsTxVector (WifiRemoteStation *st)
{
mode = GetNonErpSupported (station, 0);
}
rtsTxVector = WifiTxVector (mode, GetDefaultTxPowerLevel (), GetLongRetryCount (station), GetPreambleForTransmission (mode, GetAddress (station)), 800, 1, 1, 0, channelWidth, GetAggregation (station), false);
rtsTxVector = WifiTxVector (mode, GetDefaultTxPowerLevel (), GetPreambleForTransmission (mode, GetAddress (station)), 800, 1, 1, 0, channelWidth, GetAggregation (station), false);
return rtsTxVector;
}

4
src/wifi/model/aarfcd-wifi-manager.cc
View File

@@ -318,7 +318,7 @@ AarfcdWifiManager::DoGetDataTxVector (WifiRemoteStation *st)
NS_LOG_DEBUG ("New datarate: " << mode.GetDataRate (channelWidth));
m_currentRate = mode.GetDataRate (channelWidth);
}
return WifiTxVector (mode, GetDefaultTxPowerLevel (), GetLongRetryCount (station), GetPreambleForTransmission (mode, GetAddress (station)), 800, 1, 1, 0, channelWidth, GetAggregation (station), false);
return WifiTxVector (mode, GetDefaultTxPowerLevel (), GetPreambleForTransmission (mode, GetAddress (station)), 800, 1, 1, 0, channelWidth, GetAggregation (station), false);
}
WifiTxVector
@@ -344,7 +344,7 @@ AarfcdWifiManager::DoGetRtsTxVector (WifiRemoteStation *st)
{
mode = GetNonErpSupported (station, 0);
}
rtsTxVector = WifiTxVector (mode, GetDefaultTxPowerLevel (), GetShortRetryCount (station), GetPreambleForTransmission (mode, GetAddress (station)), 800, 1, 1, 0, channelWidth, GetAggregation (station), false);
rtsTxVector = WifiTxVector (mode, GetDefaultTxPowerLevel (), GetPreambleForTransmission (mode, GetAddress (station)), 800, 1, 1, 0, channelWidth, GetAggregation (station), false);
return rtsTxVector;
}

4
src/wifi/model/amrr-wifi-manager.cc
View File

@@ -358,7 +358,7 @@ AmrrWifiManager::DoGetDataTxVector (WifiRemoteStation *st)
NS_LOG_DEBUG ("New datarate: " << mode.GetDataRate (channelWidth));
m_currentRate = mode.GetDataRate (channelWidth);
}
return WifiTxVector (mode, GetDefaultTxPowerLevel (), GetLongRetryCount (station), GetPreambleForTransmission (mode, GetAddress (station)), 800, 1, 1, 0, channelWidth, GetAggregation (station), false);
return WifiTxVector (mode, GetDefaultTxPowerLevel (), GetPreambleForTransmission (mode, GetAddress (station)), 800, 1, 1, 0, channelWidth, GetAggregation (station), false);
}
WifiTxVector
@@ -383,7 +383,7 @@ AmrrWifiManager::DoGetRtsTxVector (WifiRemoteStation *st)
{
mode = GetNonErpSupported (station, 0);
}
rtsTxVector = WifiTxVector (mode, GetDefaultTxPowerLevel (), GetLongRetryCount (station), GetPreambleForTransmission (mode, GetAddress (station)), 800, 1, 1, 0, channelWidth, GetAggregation (station), false);
rtsTxVector = WifiTxVector (mode, GetDefaultTxPowerLevel (), GetPreambleForTransmission (mode, GetAddress (station)), 800, 1, 1, 0, channelWidth, GetAggregation (station), false);
return rtsTxVector;
}

4
src/wifi/model/aparf-wifi-manager.cc
View File

@@ -343,7 +343,7 @@ AparfWifiManager::DoGetDataTxVector (WifiRemoteStation *st)
m_rateChange (prevRate, rate, station->m_state->m_address);
station->m_prevRateIndex = station->m_rateIndex;
}
return WifiTxVector (mode, station->m_powerLevel, GetLongRetryCount (station), GetPreambleForTransmission (mode, GetAddress (st)), 800, 1, 1, 0, channelWidth, GetAggregation (station), false);
return WifiTxVector (mode, station->m_powerLevel, GetPreambleForTransmission (mode, GetAddress (st)), 800, 1, 1, 0, channelWidth, GetAggregation (station), false);
}
WifiTxVector
@@ -369,7 +369,7 @@ AparfWifiManager::DoGetRtsTxVector (WifiRemoteStation *st)
{
mode = GetNonErpSupported (station, 0);
}
rtsTxVector = WifiTxVector (mode, GetDefaultTxPowerLevel (), GetShortRetryCount (station), GetPreambleForTransmission (mode, GetAddress (st)), 800, 1, 1, 0, channelWidth, GetAggregation (station), false);
rtsTxVector = WifiTxVector (mode, GetDefaultTxPowerLevel (), GetPreambleForTransmission (mode, GetAddress (st)), 800, 1, 1, 0, channelWidth, GetAggregation (station), false);
return rtsTxVector;
}

4
src/wifi/model/arf-wifi-manager.cc
View File

@@ -226,7 +226,7 @@ ArfWifiManager::DoGetDataTxVector (WifiRemoteStation *st)
NS_LOG_DEBUG ("New datarate: " << mode.GetDataRate (channelWidth));
m_currentRate = mode.GetDataRate (channelWidth);
}
return WifiTxVector (mode, GetDefaultTxPowerLevel (), GetLongRetryCount (station), GetPreambleForTransmission (mode, GetAddress (station)), 800, 1, 1, 0, channelWidth, GetAggregation (station), false);
return WifiTxVector (mode, GetDefaultTxPowerLevel (), GetPreambleForTransmission (mode, GetAddress (station)), 800, 1, 1, 0, channelWidth, GetAggregation (station), false);
}
WifiTxVector
@@ -252,7 +252,7 @@ ArfWifiManager::DoGetRtsTxVector (WifiRemoteStation *st)
{
mode = GetNonErpSupported (station, 0);
}
rtsTxVector = WifiTxVector (mode, GetDefaultTxPowerLevel (), GetLongRetryCount (station), GetPreambleForTransmission (mode, GetAddress (station)), 800, 1, 1, 0, channelWidth, GetAggregation (station), false);
rtsTxVector = WifiTxVector (mode, GetDefaultTxPowerLevel (), GetPreambleForTransmission (mode, GetAddress (station)), 800, 1, 1, 0, channelWidth, GetAggregation (station), false);
return rtsTxVector;
}

4
src/wifi/model/cara-wifi-manager.cc
View File

@@ -195,7 +195,7 @@ CaraWifiManager::DoGetDataTxVector (WifiRemoteStation *st)
NS_LOG_DEBUG ("New datarate: " << mode.GetDataRate (channelWidth));
m_currentRate = mode.GetDataRate (channelWidth);
}
return WifiTxVector (mode, GetDefaultTxPowerLevel (), GetLongRetryCount (station), GetPreambleForTransmission (mode, GetAddress (station)), 800, 1, 1, 0, channelWidth, GetAggregation (station), false);
return WifiTxVector (mode, GetDefaultTxPowerLevel (), GetPreambleForTransmission (mode, GetAddress (station)), 800, 1, 1, 0, channelWidth, GetAggregation (station), false);
}
WifiTxVector
@@ -221,7 +221,7 @@ CaraWifiManager::DoGetRtsTxVector (WifiRemoteStation *st)
{
mode = GetNonErpSupported (station, 0);
}
rtsTxVector = WifiTxVector (mode, GetDefaultTxPowerLevel (), GetLongRetryCount (station), GetPreambleForTransmission (mode, GetAddress (station)), 800, 1, 1, 0, channelWidth, GetAggregation (station), false);
rtsTxVector = WifiTxVector (mode, GetDefaultTxPowerLevel (), GetPreambleForTransmission (mode, GetAddress (station)), 800, 1, 1, 0, channelWidth, GetAggregation (station), false);
return rtsTxVector;
}

4
src/wifi/model/constant-rate-wifi-manager.cc
View File

@@ -117,14 +117,14 @@ WifiTxVector
ConstantRateWifiManager::DoGetDataTxVector (WifiRemoteStation *st)
{
NS_LOG_FUNCTION (this << st);
return WifiTxVector (m_dataMode, GetDefaultTxPowerLevel (), GetLongRetryCount (st), GetPreambleForTransmission (m_dataMode, GetAddress (st)), ConvertGuardIntervalToNanoSeconds (m_dataMode, GetShortGuardInterval (st), NanoSeconds (GetGuardInterval (st))), GetNumberOfAntennas (), Min (GetMaxNumberOfTransmitStreams (), GetNumberOfSupportedStreams (st)), 0, GetChannelWidthForTransmission (m_dataMode, GetChannelWidth (st)), GetAggregation (st), false);
return WifiTxVector (m_dataMode, GetDefaultTxPowerLevel (), GetPreambleForTransmission (m_dataMode, GetAddress (st)), ConvertGuardIntervalToNanoSeconds (m_dataMode, GetShortGuardInterval (st), NanoSeconds (GetGuardInterval (st))), GetNumberOfAntennas (), Min (GetMaxNumberOfTransmitStreams (), GetNumberOfSupportedStreams (st)), 0, GetChannelWidthForTransmission (m_dataMode, GetChannelWidth (st)), GetAggregation (st), false);
}
WifiTxVector
ConstantRateWifiManager::DoGetRtsTxVector (WifiRemoteStation *st)
{
NS_LOG_FUNCTION (this << st);
return WifiTxVector (m_ctlMode, GetDefaultTxPowerLevel (), GetShortRetryCount (st), GetPreambleForTransmission (m_ctlMode, GetAddress (st)), ConvertGuardIntervalToNanoSeconds (m_ctlMode, GetShortGuardInterval (st), NanoSeconds (GetGuardInterval (st))), 1, 1, 0, GetChannelWidthForTransmission (m_ctlMode, GetChannelWidth (st)), GetAggregation (st), false);
return WifiTxVector (m_ctlMode, GetDefaultTxPowerLevel (), GetPreambleForTransmission (m_ctlMode, GetAddress (st)), ConvertGuardIntervalToNanoSeconds (m_ctlMode, GetShortGuardInterval (st), NanoSeconds (GetGuardInterval (st))), 1, 1, 0, GetChannelWidthForTransmission (m_ctlMode, GetChannelWidth (st)), GetAggregation (st), false);
}
bool

4
src/wifi/model/ideal-wifi-manager.cc
View File

@@ -495,7 +495,7 @@ IdealWifiManager::DoGetDataTxVector (WifiRemoteStation *st)
NS_LOG_DEBUG ("New datarate: " << maxMode.GetDataRate (channelWidth, guardInterval, selectedNss));
m_currentRate = maxMode.GetDataRate (channelWidth, guardInterval, selectedNss);
}
return WifiTxVector (maxMode, GetDefaultTxPowerLevel (), GetLongRetryCount (station), GetPreambleForTransmission (maxMode, GetAddress (station)), guardInterval, GetNumberOfAntennas (), selectedNss, 0, GetChannelWidthForTransmission (maxMode, channelWidth), GetAggregation (station), false);
return WifiTxVector (maxMode, GetDefaultTxPowerLevel (), GetPreambleForTransmission (maxMode, GetAddress (station)), guardInterval, GetNumberOfAntennas (), selectedNss, 0, GetChannelWidthForTransmission (maxMode, channelWidth), GetAggregation (station), false);
}
WifiTxVector
@@ -526,7 +526,7 @@ IdealWifiManager::DoGetRtsTxVector (WifiRemoteStation *st)
maxMode = mode;
}
}
return WifiTxVector (maxMode, GetDefaultTxPowerLevel (), GetShortRetryCount (station), GetPreambleForTransmission (maxMode, GetAddress (station)), 800, GetNumberOfAntennas (), nss, 0, GetChannelWidthForMode (maxMode), GetAggregation (station), false);
return WifiTxVector (maxMode, GetDefaultTxPowerLevel (), GetPreambleForTransmission (maxMode, GetAddress (station)), 800, GetNumberOfAntennas (), nss, 0, GetChannelWidthForMode (maxMode), GetAggregation (station), false);
}
bool

5
src/wifi/model/minstrel-ht-wifi-manager.cc
View File

@@ -914,8 +914,7 @@ MinstrelHtWifiManager::DoGetDataTxVector (WifiRemoteStation *st)
m_rateChange (dataRate, station->m_state->m_address);
}
WifiMode mode = GetMcsSupported (station, mcsIndex);
return WifiTxVector (mode, GetDefaultTxPowerLevel (), GetLongRetryCount (station),
GetPreambleForTransmission (mode, GetAddress (station)), group.sgi ? 400 : 800, GetNumberOfAntennas (), group.streams, GetNess (station), GetChannelWidthForTransmission (mode, group.chWidth), GetAggregation (station) && !station->m_isSampling, false);
return WifiTxVector (mode, GetDefaultTxPowerLevel (), GetPreambleForTransmission (mode, GetAddress (station)), group.sgi ? 400 : 800, GetNumberOfAntennas (), group.streams, GetNess (station), GetChannelWidthForTransmission (mode, group.chWidth), GetAggregation (station) && !station->m_isSampling, false);
}
}
@@ -990,7 +989,7 @@ MinstrelHtWifiManager::DoGetRtsTxVector (WifiRemoteStation *st)
NS_ASSERT (rateFound);
return WifiTxVector (rtsRate, GetDefaultTxPowerLevel (), GetShortRetryCount (station), GetPreambleForTransmission (rtsRate, GetAddress (station)),
return WifiTxVector (rtsRate, GetDefaultTxPowerLevel (), GetPreambleForTransmission (rtsRate, GetAddress (station)),
800, 1, 1, 0, GetChannelWidthForTransmission (rtsRate, GetChannelWidth (station)), GetAggregation (station), false);
}
}

4
src/wifi/model/minstrel-wifi-manager.cc
View File

@@ -368,7 +368,7 @@ MinstrelWifiManager::GetDataTxVector (MinstrelWifiRemoteStation *station)
NS_LOG_DEBUG ("New datarate: " << mode.GetDataRate (channelWidth));
m_currentRate = mode.GetDataRate (channelWidth);
}
return WifiTxVector (mode, GetDefaultTxPowerLevel (), GetLongRetryCount (station), GetPreambleForTransmission (mode, GetAddress (station)), 800, 1, 1, 0, channelWidth, GetAggregation (station), false);
return WifiTxVector (mode, GetDefaultTxPowerLevel (), GetPreambleForTransmission (mode, GetAddress (station)), 800, 1, 1, 0, channelWidth, GetAggregation (station), false);
}
WifiTxVector
@@ -392,7 +392,7 @@ MinstrelWifiManager::GetRtsTxVector (MinstrelWifiRemoteStation *station)
{
mode = GetNonErpSupported (station, 0);
}
rtsTxVector = WifiTxVector (mode, GetDefaultTxPowerLevel (), GetShortRetryCount (station), GetPreambleForTransmission (mode, GetAddress (station)), 800, 1, 1, 0, channelWidth, GetAggregation (station), false);
rtsTxVector = WifiTxVector (mode, GetDefaultTxPowerLevel (), GetPreambleForTransmission (mode, GetAddress (station)), 800, 1, 1, 0, channelWidth, GetAggregation (station), false);
return rtsTxVector;
}

4
src/wifi/model/onoe-wifi-manager.cc
View File

@@ -309,7 +309,7 @@ OnoeWifiManager::DoGetDataTxVector (WifiRemoteStation *st)
NS_LOG_DEBUG ("New datarate: " << mode.GetDataRate (channelWidth));
m_currentRate = mode.GetDataRate (channelWidth);
}
return WifiTxVector (mode, GetDefaultTxPowerLevel (), GetLongRetryCount (station), GetPreambleForTransmission (mode, GetAddress (st)), 800, 1, 1, 0, channelWidth, GetAggregation (station), false);
return WifiTxVector (mode, GetDefaultTxPowerLevel (), GetPreambleForTransmission (mode, GetAddress (st)), 800, 1, 1, 0, channelWidth, GetAggregation (station), false);
}
WifiTxVector
@@ -334,7 +334,7 @@ OnoeWifiManager::DoGetRtsTxVector (WifiRemoteStation *st)
{
mode = GetNonErpSupported (station, 0);
}
rtsTxVector = WifiTxVector (mode, GetDefaultTxPowerLevel (), GetShortRetryCount (station), GetPreambleForTransmission (mode, GetAddress (st)), 800, 1, 1, 0, channelWidth, GetAggregation (station), false);
rtsTxVector = WifiTxVector (mode, GetDefaultTxPowerLevel (), GetPreambleForTransmission (mode, GetAddress (st)), 800, 1, 1, 0, channelWidth, GetAggregation (station), false);
return rtsTxVector;
}

4
src/wifi/model/parf-wifi-manager.cc
View File

@@ -315,7 +315,7 @@ ParfWifiManager::DoGetDataTxVector (WifiRemoteStation *st)
m_rateChange (prevRate, rate, station->m_state->m_address);
station->m_prevRateIndex = station->m_rateIndex;
}
return WifiTxVector (mode, station->m_powerLevel, GetLongRetryCount (station), GetPreambleForTransmission (mode, GetAddress (station)), 800, 1, 1, 0, channelWidth, GetAggregation (station), false);
return WifiTxVector (mode, station->m_powerLevel, GetPreambleForTransmission (mode, GetAddress (station)), 800, 1, 1, 0, channelWidth, GetAggregation (station), false);
}
WifiTxVector
@@ -341,7 +341,7 @@ ParfWifiManager::DoGetRtsTxVector (WifiRemoteStation *st)
{
mode = GetNonErpSupported (station, 0);
}
rtsTxVector = WifiTxVector (mode, GetDefaultTxPowerLevel (), GetShortRetryCount (station), GetPreambleForTransmission (mode, GetAddress (station)), 800, 1, 1, 0, channelWidth, GetAggregation (station), false);
rtsTxVector = WifiTxVector (mode, GetDefaultTxPowerLevel (), GetPreambleForTransmission (mode, GetAddress (station)), 800, 1, 1, 0, channelWidth, GetAggregation (station), false);
return rtsTxVector;
}

4
src/wifi/model/rraa-wifi-manager.cc
View File

@@ -348,7 +348,7 @@ RraaWifiManager::DoGetDataTxVector (WifiRemoteStation *st)
NS_LOG_DEBUG ("New datarate: " << mode.GetDataRate (channelWidth));
m_currentRate = mode.GetDataRate (channelWidth);
}
return WifiTxVector (mode, GetDefaultTxPowerLevel (), GetLongRetryCount (station), GetPreambleForTransmission (mode, GetAddress (station)), 800, 1, 1, 0, channelWidth, GetAggregation (station), false);
return WifiTxVector (mode, GetDefaultTxPowerLevel (), GetPreambleForTransmission (mode, GetAddress (station)), 800, 1, 1, 0, channelWidth, GetAggregation (station), false);
}
WifiTxVector
@@ -372,7 +372,7 @@ RraaWifiManager::DoGetRtsTxVector (WifiRemoteStation *st)
{
mode = GetNonErpSupported (station, 0);
}
rtsTxVector = WifiTxVector (mode, GetDefaultTxPowerLevel (), GetShortRetryCount (station), GetPreambleForTransmission (mode, GetAddress (station)), 800, 1, 1, 0, channelWidth, GetAggregation (station), false);
rtsTxVector = WifiTxVector (mode, GetDefaultTxPowerLevel (), GetPreambleForTransmission (mode, GetAddress (station)), 800, 1, 1, 0, channelWidth, GetAggregation (station), false);
return rtsTxVector;
}

4
src/wifi/model/rrpaa-wifi-manager.cc
View File

@@ -398,7 +398,7 @@ RrpaaWifiManager::DoGetDataTxVector (WifiRemoteStation *st)
m_powerChange (prevPower, power, station->m_state->m_address);
station->m_prevPowerLevel = station->m_powerLevel;
}
return WifiTxVector (mode, station->m_powerLevel, GetLongRetryCount (station), GetPreambleForTransmission (mode, GetAddress (station)), 800, 1, 1, 0, channelWidth, GetAggregation (station), false);
return WifiTxVector (mode, station->m_powerLevel, GetPreambleForTransmission (mode, GetAddress (station)), 800, 1, 1, 0, channelWidth, GetAggregation (station), false);
}
WifiTxVector
RrpaaWifiManager::DoGetRtsTxVector (WifiRemoteStation *st)
@@ -421,7 +421,7 @@ RrpaaWifiManager::DoGetRtsTxVector (WifiRemoteStation *st)
{
mode = GetNonErpSupported (station, 0);
}
rtsTxVector = WifiTxVector (mode, GetDefaultTxPowerLevel (), GetShortRetryCount (station), GetPreambleForTransmission (mode, GetAddress (st)), 800, 1, 1, 0, channelWidth, GetAggregation (station), false);
rtsTxVector = WifiTxVector (mode, GetDefaultTxPowerLevel (), GetPreambleForTransmission (mode, GetAddress (st)), 800, 1, 1, 0, channelWidth, GetAggregation (station), false);
return rtsTxVector;
}

13
src/wifi/model/wifi-remote-station-manager.cc
View File

@@ -905,7 +905,6 @@ WifiRemoteStationManager::DoGetCtsToSelfTxVector (void)
return WifiTxVector (defaultMode,
GetDefaultTxPowerLevel (),
0,
defaultPreamble,
ConvertGuardIntervalToNanoSeconds (defaultMode, m_wifiPhy->GetShortGuardInterval (), m_wifiPhy->GetGuardInterval ()),
GetNumberOfAntennas (),
@@ -2098,12 +2097,6 @@ WifiRemoteStationManager::GetNess (const WifiRemoteStation *station) const
return station->m_state->m_ness;
}
uint32_t
WifiRemoteStationManager::GetShortRetryCount (const WifiRemoteStation *station) const
{
return station->m_ssrc;
}
Ptr<WifiPhy>
WifiRemoteStationManager::GetPhy (void) const
{
@@ -2116,12 +2109,6 @@ WifiRemoteStationManager::GetMac (void) const
return m_wifiMac;
}
uint32_t
WifiRemoteStationManager::GetLongRetryCount (const WifiRemoteStation *station) const
{
return station->m_slrc;
}
uint8_t
WifiRemoteStationManager::GetNSupported (const WifiRemoteStation *station) const
{

16
src/wifi/model/wifi-remote-station-manager.h
View File

@@ -1068,22 +1068,6 @@ protected:
* \return the number of Ness the station has
*/
uint32_t GetNess (const WifiRemoteStation *station) const;
/**
* Return the long retry limit of the given station.
*
* \param station the station being queried
*
* \return the long retry limit of the the station
*/
uint32_t GetLongRetryCount (const WifiRemoteStation *station) const;
/**
* Return the short retry limit of the given station.
*
* \param station the station being queried
*
* \return the short retry limit of the the station
*/
uint32_t GetShortRetryCount (const WifiRemoteStation *station) const;
/**
* Return the preamble to be used for the transmission.
*

18
src/wifi/model/wifi-tx-vector.cc
View File

@@ -24,8 +24,7 @@
namespace ns3 {
WifiTxVector::WifiTxVector ()
: m_retries (0),
m_preamble (WIFI_PREAMBLE_NONE),
: m_preamble (WIFI_PREAMBLE_NONE),
m_channelWidth (20),
m_guardInterval (800),
m_nTx (1),
@@ -40,7 +39,6 @@ WifiTxVector::WifiTxVector ()
WifiTxVector::WifiTxVector (WifiMode mode,
uint8_t powerLevel,
uint8_t retries,
WifiPreamble preamble,
uint16_t guardInterval,
uint8_t nTx,
@@ -51,7 +49,6 @@ WifiTxVector::WifiTxVector (WifiMode mode,
bool stbc)
: m_mode (mode),
m_txPowerLevel (powerLevel),
m_retries (retries),
m_preamble (preamble),
m_channelWidth (channelWidth),
m_guardInterval (guardInterval),
@@ -85,12 +82,6 @@ WifiTxVector::GetTxPowerLevel (void) const
return m_txPowerLevel;
}
uint8_t
WifiTxVector::GetRetries (void) const
{
return m_retries;
}
WifiPreamble
WifiTxVector::GetPreambleType (void) const
{
@@ -153,12 +144,6 @@ WifiTxVector::SetTxPowerLevel (uint8_t powerlevel)
m_txPowerLevelInitialized = true;
}
void
WifiTxVector::SetRetries (uint8_t retries)
{
m_retries = retries;
}
void
WifiTxVector::SetPreambleType (WifiPreamble preamble)
{
@@ -243,7 +228,6 @@ std::ostream & operator << ( std::ostream &os, const WifiTxVector &v)
{
os << "mode: " << v.GetMode () <<
" txpwrlvl: " << +v.GetTxPowerLevel () <<
" retries: " << +v.GetRetries () <<
" preamble: " << v.GetPreambleType () <<
" channel width: " << +v.GetChannelWidth () <<
" GI: " << v.GetGuardInterval () <<

14
src/wifi/model/wifi-tx-vector.h
View File

@@ -67,7 +67,6 @@ public:
*
* \param mode WifiMode
* \param powerLevel transmission power level
* \param retries retries
* \param preamble preamble type
* \param guardInterval the guard interval duration in nanoseconds
* \param nTx the number of TX antennas
@@ -79,7 +78,6 @@ public:
*/
WifiTxVector (WifiMode mode,
uint8_t powerLevel,
uint8_t retries,
WifiPreamble preamble,
uint16_t guardInterval,
uint8_t nTx,
@@ -108,16 +106,6 @@ public:
* \param powerlevel
*/
void SetTxPowerLevel (uint8_t powerlevel);
/**
* \returns the number of retries
*/
uint8_t GetRetries (void) const;
/**
* Sets the number of retries
*
* \param retries
*/
void SetRetries (uint8_t retries);
/**
* \returns the preamble type
*/
@@ -220,8 +208,6 @@ private:
uint8_t m_txPowerLevel; /**< The TXPWR_LEVEL parameter in Table 15-4.
It is the value that will be passed
to PMD_TXPWRLVL.request */
uint8_t m_retries; /**< The DATA_RETRIES/RTS_RETRIES parameter
for Click radiotap information */
WifiPreamble m_preamble; /**< preamble */
uint8_t m_channelWidth; /**< channel width in MHz */
uint16_t m_guardInterval; /**< guard interval duration in nanoseconds */

2
src/wifi/test/spectrum-wifi-phy-test.cc
View File

@@ -101,7 +101,7 @@ SpectrumWifiPhyBasicTest::SpectrumWifiPhyBasicTest (std::string name)
Ptr<SpectrumSignalParameters>
SpectrumWifiPhyBasicTest::MakeSignal (double txPowerWatts)
{
WifiTxVector txVector = WifiTxVector (WifiPhy::GetOfdmRate6Mbps (), 0, 0, WIFI_PREAMBLE_LONG, false, 1, 1, 0, 20, false, false);
WifiTxVector txVector = WifiTxVector (WifiPhy::GetOfdmRate6Mbps (), 0, WIFI_PREAMBLE_LONG, false, 1, 1, 0, 20, false, false);
MpduType mpdutype = NORMAL_MPDU;
Ptr<Packet> pkt = Create<Packet> (1000);