From db1faf66fe9ca091570bfde837a6faf991b89bb0 Mon Sep 17 00:00:00 2001 From: Tom Henderson Date: Thu, 10 Mar 2016 14:16:31 -0800 Subject: [PATCH] wifi: Align MinstrelHt API with changeset b1aec364f2c7 --- src/wifi/model/minstrel-ht-wifi-manager.cc | 4 ++-- src/wifi/model/minstrel-ht-wifi-manager.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/wifi/model/minstrel-ht-wifi-manager.cc b/src/wifi/model/minstrel-ht-wifi-manager.cc index ccc817759..46937e4df 100644 --- a/src/wifi/model/minstrel-ht-wifi-manager.cc +++ b/src/wifi/model/minstrel-ht-wifi-manager.cc @@ -635,9 +635,9 @@ MinstrelHtWifiManager::DoReportFinalDataFailed (WifiRemoteStation *st) } void -MinstrelHtWifiManager::DoReportAmpduTxStatus (WifiRemoteStation *st, uint32_t nSuccessfulMpdus, uint32_t nFailedMpdus) +MinstrelHtWifiManager::DoReportAmpduTxStatus (WifiRemoteStation *st, uint32_t nSuccessfulMpdus, uint32_t nFailedMpdus, double rxSnr, double dataSnr) { - NS_LOG_FUNCTION (this << st << nSuccessfulMpdus << nFailedMpdus); + NS_LOG_FUNCTION (this << st << nSuccessfulMpdus << nFailedMpdus << rxSnr << dataSnr); MinstrelHtWifiRemoteStation *station = (MinstrelHtWifiRemoteStation *) st; CheckInit (station); diff --git a/src/wifi/model/minstrel-ht-wifi-manager.h b/src/wifi/model/minstrel-ht-wifi-manager.h index b3e348b8f..acb6c27e5 100644 --- a/src/wifi/model/minstrel-ht-wifi-manager.h +++ b/src/wifi/model/minstrel-ht-wifi-manager.h @@ -209,7 +209,7 @@ private: virtual void DoReportFinalDataFailed (WifiRemoteStation *station); virtual WifiTxVector DoGetDataTxVector (WifiRemoteStation *station); virtual WifiTxVector DoGetRtsTxVector (WifiRemoteStation *station); - virtual void DoReportAmpduTxStatus (WifiRemoteStation *station, uint32_t nSuccessfulMpdus, uint32_t nFailedMpdus); + virtual void DoReportAmpduTxStatus (WifiRemoteStation *station, uint32_t nSuccessfulMpdus, uint32_t nFailedMpdus, double rxSnr, double dataSnr); virtual bool IsLowLatency (void) const; virtual bool DoNeedDataRetransmission (WifiRemoteStation *st, Ptr packet, bool normally); virtual void DoDisposeStation (WifiRemoteStation *station);