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

wifi: Fix uint32_t to uint64_t (based on Robert Ammon's patch)

Browse Source
This commit is contained in:
Sébastien Deronne
2018-02-17 00:21:06 +01:00
parent cd389fdf04
commit 4b496742a1
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/wifi/helper/wifi-helper.cc
View File

@@ -201,7 +201,7 @@ WifiPhyHelper::PcapSniffTxEvent (
header.SetFrameFlags (frameFlags);
uint32_t rate = 0;
uint64_t rate = 0;
if (txVector.GetMode ().GetModulationClass () != WIFI_MOD_CLASS_HT && txVector.GetMode ().GetModulationClass () != WIFI_MOD_CLASS_VHT && txVector.GetMode ().GetModulationClass () != WIFI_MOD_CLASS_HE)
{
rate = txVector.GetMode ().GetDataRate (txVector.GetChannelWidth (), txVector.GetGuardInterval (), 1) * txVector.GetNss () / 500000;
@@ -395,7 +395,7 @@ WifiPhyHelper::PcapSniffRxEvent (
header.SetFrameFlags (frameFlags);
uint32_t rate = 0;
uint64_t rate = 0;
if (txVector.GetMode ().GetModulationClass () != WIFI_MOD_CLASS_HT && txVector.GetMode ().GetModulationClass () != WIFI_MOD_CLASS_VHT && txVector.GetMode ().GetModulationClass () != WIFI_MOD_CLASS_HE)
{
rate = txVector.GetMode ().GetDataRate (txVector.GetChannelWidth (), txVector.GetGuardInterval (), 1) * txVector.GetNss () / 500000;

2
src/wifi/test/wifi-error-rate-models-test.cc
View File

@@ -66,7 +66,7 @@ WifiErrorRateModelsTestCaseDsss::DoRun (void)
{
// 1024 bytes plus headers
uint32_t size = (1024 + 40 + 14) * 8;
uint64_t size = (1024 + 40 + 14) * 8;
// Spot test some values returned from DsssErrorRateModel
// Values taken from sample 80211b.c program used in validation paper
double value;