Mercurial Mercurial > ns-3.24 / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
remove unused payloadMode argument in WifiPhy::GetPlcpHtSigHeaderDuration
authorGhada Badawy <gbadawy@gmail.com>
Fri, 17 Apr 2015 19:58:53 +0200
changeset 11332 8ea5c08711a3
parent 11331 0e38e6046c26
child 11333 4097727fb523
remove unused payloadMode argument in WifiPhy::GetPlcpHtSigHeaderDuration
src/wifi/model/interference-helper.cc file | annotate | diff | comparison | revisions
src/wifi/model/wifi-phy.cc file | annotate | diff | comparison | revisions
src/wifi/model/wifi-phy.h file | annotate | diff | comparison | revisions 
--- a/src/wifi/model/interference-helper.cc	Thu Apr 16 21:30:18 2015 -0700
+++ b/src/wifi/model/interference-helper.cc	Fri Apr 17 19:58:53 2015 +0200
@@ -283,7 +283,7 @@
   WifiMode headerMode = WifiPhy::GetPlcpHeaderMode (payloadMode, preamble);
   Time plcpHeaderStart = (*j).GetTime () + WifiPhy::GetPlcpPreambleDuration (payloadMode, preamble); //packet start time+ preamble
   Time plcpHsigHeaderStart = plcpHeaderStart + WifiPhy::GetPlcpHeaderDuration (payloadMode, preamble);//packet start time+ preamble+L SIG
-  Time plcpHtTrainingSymbolsStart = plcpHsigHeaderStart + WifiPhy::GetPlcpHtSigHeaderDuration (payloadMode, preamble);//packet start time+ preamble+L SIG+HT SIG
+  Time plcpHtTrainingSymbolsStart = plcpHsigHeaderStart + WifiPhy::GetPlcpHtSigHeaderDuration (preamble);//packet start time+ preamble+L SIG+HT SIG
   Time plcpPayloadStart =plcpHtTrainingSymbolsStart + WifiPhy::GetPlcpHtTrainingSymbolDuration (preamble,event->GetTxVector()); //packet start time+ preamble+L SIG+HT SIG+Training
   double noiseInterferenceW = (*j).GetDelta ();
   double powerW = event->GetRxPowerW ();
--- a/src/wifi/model/wifi-phy.cc	Thu Apr 16 21:30:18 2015 -0700
+++ b/src/wifi/model/wifi-phy.cc	Fri Apr 17 19:58:53 2015 +0200
@@ -170,7 +170,7 @@
 
 //return L-SIG
 Time
-WifiPhy::GetPlcpHtSigHeaderDuration (WifiMode payloadMode, WifiPreamble preamble)
+WifiPhy::GetPlcpHtSigHeaderDuration (WifiPreamble preamble)
 {
          switch (preamble)
             {
@@ -579,7 +579,7 @@
   WifiMode payloadMode=txvector.GetMode();
   Time duration = GetPlcpPreambleDuration (payloadMode, preamble)
     + GetPlcpHeaderDuration (payloadMode, preamble)
-    + GetPlcpHtSigHeaderDuration (payloadMode, preamble)
+    + GetPlcpHtSigHeaderDuration (preamble)
     + GetPlcpHtTrainingSymbolDuration (preamble, txvector)
     + GetPayloadDuration (size, txvector, preamble, frequency, packetType, incFlag);
   return duration;
--- a/src/wifi/model/wifi-phy.h	Thu Apr 16 21:30:18 2015 -0700
+++ b/src/wifi/model/wifi-phy.h	Fri Apr 17 19:58:53 2015 +0200
@@ -311,12 +311,11 @@
    */
   static WifiMode GetMFPlcpHeaderMode (WifiMode payloadMode, WifiPreamble preamble);
   /** 
-   * \param payloadMode the WifiMode use for the transmission of the payload
    * \param preamble the type of preamble
    * 
    * \return the duration of the HT-SIG in Mixed Format and greenfield format PLCP header 
    */
-  static Time GetPlcpHtSigHeaderDuration (WifiMode payloadMode, WifiPreamble preamble);
+  static Time GetPlcpHtSigHeaderDuration (WifiPreamble preamble);
 
 
   /**
ns-3.24