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

wifi: (fixes #2771) Ideal wifi manager does not check the maximum number of TX streams

Browse Source
This commit is contained in:
Sébastien Deronne
2017-09-25 20:25:58 +02:00
parent 46a13fd0e1
commit a7f92e2d46
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
RELEASE_NOTES
View File

@@ -120,6 +120,7 @@ Bugs fixed
- Bug 2762 - BindToNetDevice behaviour is not coherent with Linux
- Bug 2763 - wifi management packets in the PCAPs are all marked as wrong by Wireshark
- Bug 2769 - Set ssthresh correctly upon RTO
- Bug 2771 - wifi: Simulation fails with IdealWifiManager if stations have different number of antennas
- Bug 2781 - tcp: Do not go beyond limit in TcpTxBuffer
- Bug 2783 - wifi: MonitorSnifferRx SNR is invariant to RxNoiseFigure

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

@@ -330,7 +330,7 @@ IdealWifiManager::DoGetDataTxVector (WifiRemoteStation *st)
uint8_t nss = (mode.GetMcsValue () / 8) + 1;
txVector.SetNss (nss);
if (WifiPhy::IsValidTxVector (txVector) == false ||
nss > GetNumberOfSupportedStreams (st))
nss > std::min (GetMaxNumberOfTransmitStreams (), GetNumberOfSupportedStreams (st)))
{
NS_LOG_DEBUG ("Skipping mode " << mode.GetUniqueName () <<
" nss " << (uint16_t) nss << " width " <<
@@ -370,7 +370,7 @@ IdealWifiManager::DoGetDataTxVector (WifiRemoteStation *st)
{
continue;
}
for (uint8_t nss = 1; nss <= GetNumberOfSupportedStreams (station); nss++)
for (uint8_t nss = 1; nss <= std::min (GetMaxNumberOfTransmitStreams (), GetNumberOfSupportedStreams (station)); nss++)
{
txVector.SetNss (nss);
if (WifiPhy::IsValidTxVector (txVector) == false)