From ef605df50bf8dfd9e4974e539558673773438d21 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Deronne?= Date: Mon, 2 Nov 2015 18:43:56 +0100 Subject: [PATCH] Fix copy-paste errors in ap-wifi-mac.cc and in sta-wifi-mac.cc --- src/wifi/model/ap-wifi-mac.cc | 4 ++-- src/wifi/model/sta-wifi-mac.cc | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/wifi/model/ap-wifi-mac.cc b/src/wifi/model/ap-wifi-mac.cc index 5ceee13c7..a95cf8431 100644 --- a/src/wifi/model/ap-wifi-mac.cc +++ b/src/wifi/model/ap-wifi-mac.cc @@ -362,9 +362,9 @@ ApWifiMac::GetHtCapabilities (void) const { WifiMode mcs = m_phy->GetMcs (i); capabilities.SetRxMcsBitmask (mcs.GetMcsValue ()); - if (mcs.GetDataRate (m_phy->GetGuardInterval (), m_phy->GetGuardInterval (), 1) > maxSupportedRate) + if (mcs.GetDataRate (m_phy->GetChannelWidth (), m_phy->GetGuardInterval (), 1) > maxSupportedRate) { - maxSupportedRate = mcs.GetDataRate (m_phy->GetGuardInterval (), m_phy->GetGuardInterval (), 1); + maxSupportedRate = mcs.GetDataRate (m_phy->GetChannelWidth (), m_phy->GetGuardInterval (), 1); } } capabilities.SetRxHighestSupportedDataRate (maxSupportedRate / 1e6); //in Mbit/s diff --git a/src/wifi/model/sta-wifi-mac.cc b/src/wifi/model/sta-wifi-mac.cc index abadcc5f7..ff7ef2a13 100644 --- a/src/wifi/model/sta-wifi-mac.cc +++ b/src/wifi/model/sta-wifi-mac.cc @@ -686,9 +686,9 @@ StaWifiMac::GetHtCapabilities (void) const { WifiMode mcs = m_phy->GetMcs (i); capabilities.SetRxMcsBitmask (mcs.GetMcsValue ()); - if (mcs.GetDataRate (m_phy->GetGuardInterval (), m_phy->GetGuardInterval (), 1) > maxSupportedRate) + if (mcs.GetDataRate (m_phy->GetChannelWidth (), m_phy->GetGuardInterval (), 1) > maxSupportedRate) { - maxSupportedRate = mcs.GetDataRate (m_phy->GetGuardInterval (), m_phy->GetGuardInterval (), 1); + maxSupportedRate = mcs.GetDataRate (m_phy->GetChannelWidth (), m_phy->GetGuardInterval (), 1); } } capabilities.SetRxHighestSupportedDataRate (maxSupportedRate / 1e6); //in Mbit/s