From 4bbd4f6021ddd8d4b5909f75bc268cd2cb02192a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Deronne?= Date: Sat, 21 Oct 2017 10:18:24 +0200 Subject: [PATCH] wifi: check style --- src/wifi/model/ideal-wifi-manager.cc | 10 +++++----- src/wifi/model/mac-low.cc | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/wifi/model/ideal-wifi-manager.cc b/src/wifi/model/ideal-wifi-manager.cc index fc78c458e..14fe4514c 100644 --- a/src/wifi/model/ideal-wifi-manager.cc +++ b/src/wifi/model/ideal-wifi-manager.cc @@ -121,7 +121,7 @@ IdealWifiManager::DoInitialize () nModes = GetPhy ()->GetNMcs (); for (uint32_t i = 0; i < nModes; i++) { - for (uint16_t j = 20; j <= GetPhy ()->GetChannelWidth (); j*=2) + for (uint16_t j = 20; j <= GetPhy ()->GetChannelWidth (); j *= 2) { txVector.SetChannelWidth (j); mode = GetPhy ()->GetMcs (i); @@ -329,8 +329,8 @@ IdealWifiManager::DoGetDataTxVector (WifiRemoteStation *st) // Derive NSS from the MCS index. There is a different mode for each possible NSS value. uint8_t nss = (mode.GetMcsValue () / 8) + 1; txVector.SetNss (nss); - if (WifiPhy::IsValidTxVector (txVector) == false || - nss > std::min (GetMaxNumberOfTransmitStreams (), GetNumberOfSupportedStreams (st))) + if (WifiPhy::IsValidTxVector (txVector) == false + || nss > std::min (GetMaxNumberOfTransmitStreams (), GetNumberOfSupportedStreams (st))) { NS_LOG_DEBUG ("Skipping mode " << mode.GetUniqueName () << " nss " << (uint16_t) nss << " width " << @@ -340,7 +340,7 @@ IdealWifiManager::DoGetDataTxVector (WifiRemoteStation *st) double threshold = GetSnrThreshold (txVector); uint64_t dataRate = mode.GetDataRate (txVector.GetChannelWidth (), txVector.GetGuardInterval (), nss); NS_LOG_DEBUG ("Testing mode " << mode.GetUniqueName () << - " data rate " << dataRate << + " data rate " << dataRate << " threshold " << threshold << " last snr observed " << station->m_lastSnrObserved << " cached " << station->m_lastSnrCached); @@ -355,7 +355,7 @@ IdealWifiManager::DoGetDataTxVector (WifiRemoteStation *st) maxMode = mode; selectedNss = nss; } - } + } else if (mode.GetModulationClass () == WIFI_MOD_CLASS_VHT) { guardInterval = std::max (GetShortGuardInterval (station) ? 400 : 800, GetPhy ()->GetShortGuardInterval () ? 400 : 800); diff --git a/src/wifi/model/mac-low.cc b/src/wifi/model/mac-low.cc index d5513e469..189bc8c9c 100644 --- a/src/wifi/model/mac-low.cc +++ b/src/wifi/model/mac-low.cc @@ -2896,7 +2896,7 @@ MacLow::AggregateToAmpdu (Ptr packet, const WifiMacHeader hdr) else { Ptr item = queue->PeekByTidAndAddress (tid, - WifiMacHeader::ADDR1, hdr.GetAddr1 ()); + WifiMacHeader::ADDR1, hdr.GetAddr1 ()); if (item != 0) { peekedPacket = item->GetPacket ();