From e96f106db04dac3bc1262ebe81b5474b053ba0ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Deronne?= Date: Fri, 17 Jun 2016 13:49:33 +0200 Subject: [PATCH] wifi: (fixes #2408) Fixes pcap issues with HT Minstrel (patch from Tommaso and Matias) --- RELEASE_NOTES | 1 + src/wifi/model/minstrel-ht-wifi-manager.cc | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/RELEASE_NOTES b/RELEASE_NOTES index 6c0f60b58..cfc8ce4e4 100644 --- a/RELEASE_NOTES +++ b/RELEASE_NOTES @@ -63,6 +63,7 @@ Bugs fixed - Bug 2398 - add SNR tag to beacons and probe responses - Bug 2402 - IPv4 Interface forwarding state is not honored - Bug 2406 - Poor 802.11g performance in ad-hoc mode +- Bug 2408 - Simulation fails when 802.11n/ac is running with HT Minstrel and pcap enabled - Bug 2414 - UdpSocket doesn't call NotifyConnectionFailed - Bug 2419 - BsmApplication should use RecvFrom and not SocketAddressTag - Bug 2420 - Remove code duplication between Wifi and Wave modules diff --git a/src/wifi/model/minstrel-ht-wifi-manager.cc b/src/wifi/model/minstrel-ht-wifi-manager.cc index 97968eb1d..78f1cab4b 100644 --- a/src/wifi/model/minstrel-ht-wifi-manager.cc +++ b/src/wifi/model/minstrel-ht-wifi-manager.cc @@ -934,7 +934,7 @@ MinstrelHtWifiManager::DoGetDataTxVector (WifiRemoteStation *st) } return WifiTxVector (GetMcsSupported (station, mcsIndex), GetDefaultTxPowerLevel (), GetLongRetryCount (station), - group.sgi, group.streams, GetNess (station), group.chWidth, !station->m_isSampling, GetStbc (station)); + group.sgi, group.streams, GetNess (station), group.chWidth, GetAggregation (station) && !station->m_isSampling, GetStbc (station)); } }