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

wifi: Eliminate some more Visual Studio compiler warnings

Browse Source
This commit is contained in:
Robert Ammon
2018-05-11 16:45:31 +02:00
parent 1a7625a7e1
commit 39c8a2d3f7
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/wifi/model/mac-low.cc
View File

@@ -1866,7 +1866,7 @@ MacLow::StoreMpduIfNeeded (Ptr<Packet> packet, WifiMacHeader hdr)
BufferedPacket bufferedPacket (packet, hdr);
uint16_t endSequence = ((*it).second.first.GetStartingSequence () + 2047) % 4096;
uint16_t mappedSeqControl = QosUtilsMapSeqControlToUniqueInteger (hdr.GetSequenceControl (), endSequence);
uint32_t mappedSeqControl = QosUtilsMapSeqControlToUniqueInteger (hdr.GetSequenceControl (), endSequence);
BufferedPacketI i = (*it).second.second.begin ();
for (; i != (*it).second.second.end ()
@@ -1949,7 +1949,7 @@ MacLow::RxCompleteBufferedPacketsWithSmallerSequence (uint16_t seq, Mac48Address
if (it != m_bAckAgreements.end ())
{
uint16_t endSequence = ((*it).second.first.GetStartingSequence () + 2047) % 4096;
uint16_t mappedStart = QosUtilsMapSeqControlToUniqueInteger (seq, endSequence);
uint32_t mappedStart = QosUtilsMapSeqControlToUniqueInteger (seq, endSequence);
BufferedPacketI last = (*it).second.second.begin ();
uint16_t guard = 0;
if (last != (*it).second.second.end ())

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

@@ -1580,7 +1580,7 @@ MinstrelHtWifiManager::CalculateRetransmits (MinstrelHtWifiRemoteStation *statio
}
double
MinstrelHtWifiManager::CalculateEwmsd (double oldEwmsd, double currentProb, double ewmaProb, uint32_t weight)
MinstrelHtWifiManager::CalculateEwmsd (double oldEwmsd, double currentProb, double ewmaProb, double weight)
{
double diff, incr, tmp;

2
src/wifi/model/minstrel-ht-wifi-manager.h
View File

@@ -442,7 +442,7 @@ private:
* \param weight the weight
* \returns the EWMSD
*/
double CalculateEwmsd (double oldEwmsd, double currentProb, double ewmaProb, uint32_t weight);
double CalculateEwmsd (double oldEwmsd, double currentProb, double ewmaProb, double weight);
/**
* Initialize Sample Table.

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

@@ -406,7 +406,7 @@ RraaWifiManager::RunBasicAlgorithm (RraaWifiRemoteStation *station)
{
NS_LOG_FUNCTION (this << station);
WifiRraaThresholds thresholds = GetThresholds (station, station->m_rateIndex);
double ploss = (static_cast<double> (station->m_nFailed) / thresholds.m_ewnd);
double ploss = (station->m_nFailed / thresholds.m_ewnd);
if (station->m_counter == 0
|| ploss > thresholds.m_mtl)
{