wifi: Pass number of data bits instead of number of coded bits to error models

This commit is contained in:
Sébastien Deronne
2019-05-25 10:33:46 +02:00
parent dd606f7114
commit 32feed92ee
3 changed files with 4 additions and 4 deletions

View File

@@ -39,6 +39,7 @@ Bugs fixed
- Bug 3027 - lte: S1 signalling is done before RRC connection establishment is finished
- Issue #11 - mobility: Rectangle::GetClosestSide returns the correct side also for positions outside the rectangle
- Issue #27 - wifi: Re-compute the A-MPDU after an RTS/CTS exchange fails
- Issue #28 - wifi: wifi error model: coded bits vs. data bits
- Issue #32 - wifi: Example "rate-adaptation-distance.cc" fails.
- Issue #33 - wifi: Issues with QosTxop::StartNextPacket
- Issue #35 - wifi: Unexpected EDCA performance under virtual collisions for 802.11n

View File

@@ -262,7 +262,7 @@ InterferenceHelper::CalculateChunkSuccessRate (double snir, Time duration, WifiM
{
return 1.0;
}
uint64_t rate = mode.GetPhyRate (txVector);
uint64_t rate = mode.GetDataRate (txVector);
uint64_t nbits = static_cast<uint64_t> (rate * duration.GetSeconds ());
if (txVector.GetMode ().GetModulationClass () == WIFI_MOD_CLASS_HT || txVector.GetMode ().GetModulationClass () == WIFI_MOD_CLASS_VHT || txVector.GetMode ().GetModulationClass () == WIFI_MOD_CLASS_HE)
{

View File

@@ -1634,10 +1634,9 @@ TestAmpduReception::DoSetup (void)
void
TestAmpduReception::DoRun (void)
{
WifiHelper::EnableLogComponents ();
RngSeedManager::SetSeed (1);
RngSeedManager::SetRun (1);
int64_t streamNumber = 3;
int64_t streamNumber = 1;
double rxPowerDbm = -30;
m_phy->AssignStreams (streamNumber);
@@ -1663,7 +1662,7 @@ TestAmpduReception::DoRun (void)
Simulator::Schedule (Seconds (1.1), &TestAmpduReception::CheckRxDroppedBitmapAmpdu2, this, 0b00000000);
Simulator::Schedule (Seconds (1.2), &TestAmpduReception::ResetBitmaps, this);
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
// CASE 2: receive two A-MPDUs (containing each 3 MPDUs) where the second A-MPDU is received with power under RX sensitivity.
// The second A-MPDU is received 2 microseconds after the first A-MPDU (i.e. during preamble detection).