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.
Better visibility in if conditions
authorSébastien Deronne <sebastien.deronne@gmail.com>
Sat, 05 Sep 2015 15:53:37 +0200
changeset 11644 527ed7692b84
parent 11643 eb0fc97dfd5b
child 11645 1681ff2edd04
Better visibility in if conditions
src/wifi/model/aarf-wifi-manager.cc file | annotate | diff | comparison | revisions
src/wifi/model/aarfcd-wifi-manager.cc file | annotate | diff | comparison | revisions
src/wifi/model/amrr-wifi-manager.cc file | annotate | diff | comparison | revisions
src/wifi/model/aparf-wifi-manager.cc file | annotate | diff | comparison | revisions
src/wifi/model/arf-wifi-manager.cc file | annotate | diff | comparison | revisions
src/wifi/model/cara-wifi-manager.cc file | annotate | diff | comparison | revisions
src/wifi/model/ideal-wifi-manager.cc file | annotate | diff | comparison | revisions
src/wifi/model/minstrel-wifi-manager.cc file | annotate | diff | comparison | revisions
src/wifi/model/onoe-wifi-manager.cc file | annotate | diff | comparison | revisions
src/wifi/model/parf-wifi-manager.cc file | annotate | diff | comparison | revisions
src/wifi/model/rraa-wifi-manager.cc file | annotate | diff | comparison | revisions 
--- a/src/wifi/model/aarf-wifi-manager.cc	Sat Sep 05 13:37:30 2015 +0200
+++ b/src/wifi/model/aarf-wifi-manager.cc	Sat Sep 05 15:53:37 2015 +0200
@@ -233,7 +233,7 @@
   NS_LOG_FUNCTION (this << st << size);
   AarfWifiRemoteStation *station = (AarfWifiRemoteStation *) st;
   uint32_t channelWidth = GetChannelWidth (station);
-  if (channelWidth >= 40)
+  if (channelWidth > 20 && channelWidth != 22)
     {
       //avoid to use legacy rate adaptation algorithms for IEEE 802.11n/ac
       channelWidth = 20;
@@ -249,7 +249,7 @@
   /// RTS only by picking a single rate within the BasicRateSet.
   AarfWifiRemoteStation *station = (AarfWifiRemoteStation *) st;
   uint32_t channelWidth = GetChannelWidth (station);
-  if (channelWidth >= 40)
+  if (channelWidth > 20 && channelWidth != 22)
     {
       //avoid to use legacy rate adaptation algorithms for IEEE 802.11n/ac
       channelWidth = 20;
--- a/src/wifi/model/aarfcd-wifi-manager.cc	Sat Sep 05 13:37:30 2015 +0200
+++ b/src/wifi/model/aarfcd-wifi-manager.cc	Sat Sep 05 15:53:37 2015 +0200
@@ -305,7 +305,7 @@
   NS_LOG_FUNCTION (this << st << size);
   AarfcdWifiRemoteStation *station = (AarfcdWifiRemoteStation *) st;
   uint32_t channelWidth = GetChannelWidth (station);
-  if (channelWidth >= 40)
+  if (channelWidth > 20 && channelWidth != 22)
     {
       //avoid to use legacy rate adaptation algorithms for IEEE 802.11n/ac
       channelWidth = 20;
@@ -321,7 +321,7 @@
   /// RTS only by picking a single rate within the BasicRateSet.
   AarfcdWifiRemoteStation *station = (AarfcdWifiRemoteStation *) st;
   uint32_t channelWidth = GetChannelWidth (station);
-  if (channelWidth >= 40)
+  if (channelWidth > 20 && channelWidth != 22)
     {
       //avoid to use legacy rate adaptation algorithms for IEEE 802.11n/ac
       channelWidth = 20;
--- a/src/wifi/model/amrr-wifi-manager.cc	Sat Sep 05 13:37:30 2015 +0200
+++ b/src/wifi/model/amrr-wifi-manager.cc	Sat Sep 05 15:53:37 2015 +0200
@@ -336,7 +336,7 @@
         }
     }
   uint32_t channelWidth = GetChannelWidth (station);
-  if (channelWidth >= 40)
+  if (channelWidth > 20 && channelWidth != 22)
     {
       //avoid to use legacy rate adaptation algorithms for IEEE 802.11n/ac
       channelWidth = 20;
@@ -350,7 +350,7 @@
   NS_LOG_FUNCTION (this << st);
   AmrrWifiRemoteStation *station = (AmrrWifiRemoteStation *)st;
   uint32_t channelWidth = GetChannelWidth (station);
-  if (channelWidth >= 40)
+  if (channelWidth > 20 && channelWidth != 22)
     {
       //avoid to use legacy rate adaptation algorithms for IEEE 802.11n/ac
       channelWidth = 20;
--- a/src/wifi/model/aparf-wifi-manager.cc	Sat Sep 05 13:37:30 2015 +0200
+++ b/src/wifi/model/aparf-wifi-manager.cc	Sat Sep 05 15:53:37 2015 +0200
@@ -323,7 +323,7 @@
   NS_LOG_FUNCTION (this << st << size);
   AparfWifiRemoteStation *station = (AparfWifiRemoteStation *) st;
   uint32_t channelWidth = GetChannelWidth (station);
-  if (channelWidth >= 40)
+  if (channelWidth > 20 && channelWidth != 22)
     {
       //avoid to use legacy rate adaptation algorithms for IEEE 802.11n/ac
       channelWidth = 20;
@@ -340,7 +340,7 @@
   /// RTS only by picking a single rate within the BasicRateSet.
   AparfWifiRemoteStation *station = (AparfWifiRemoteStation *) st;
   uint32_t channelWidth = GetChannelWidth (station);
-  if (channelWidth >= 40)
+  if (channelWidth > 20 && channelWidth != 22)
     {
       //avoid to use legacy rate adaptation algorithms for IEEE 802.11n/ac
       channelWidth = 20;
--- a/src/wifi/model/arf-wifi-manager.cc	Sat Sep 05 13:37:30 2015 +0200
+++ b/src/wifi/model/arf-wifi-manager.cc	Sat Sep 05 15:53:37 2015 +0200
@@ -209,7 +209,7 @@
   NS_LOG_FUNCTION (this << st << size);
   ArfWifiRemoteStation *station = (ArfWifiRemoteStation *) st;
   uint32_t channelWidth = GetChannelWidth (station);
-  if (channelWidth >= 40)
+  if (channelWidth > 20 && channelWidth != 22)
     {
       //avoid to use legacy rate adaptation algorithms for IEEE 802.11n/ac
       channelWidth = 20;
@@ -225,7 +225,7 @@
   /// RTS only by picking a single rate within the BasicRateSet.
   ArfWifiRemoteStation *station = (ArfWifiRemoteStation *) st;
   uint32_t channelWidth = GetChannelWidth (station);
-  if (channelWidth >= 40)
+  if (channelWidth > 20 && channelWidth != 22)
     {
       //avoid to use legacy rate adaptation algorithms for IEEE 802.11n/ac
       channelWidth = 20;
--- a/src/wifi/model/cara-wifi-manager.cc	Sat Sep 05 13:37:30 2015 +0200
+++ b/src/wifi/model/cara-wifi-manager.cc	Sat Sep 05 15:53:37 2015 +0200
@@ -184,7 +184,7 @@
   NS_LOG_FUNCTION (this << st << size);
   CaraWifiRemoteStation *station = (CaraWifiRemoteStation *) st;
   uint32_t channelWidth = GetChannelWidth (station);
-  if (channelWidth >= 40)
+  if (channelWidth > 20 && channelWidth != 22)
     {
       //avoid to use legacy rate adaptation algorithms for IEEE 802.11n/ac
       channelWidth = 20;
@@ -200,7 +200,7 @@
   /// \todo we could/should implement the Arf algorithm for
   /// RTS only by picking a single rate within the BasicRateSet.
   uint32_t channelWidth = GetChannelWidth (station);
-  if (channelWidth >= 40)
+  if (channelWidth > 20 && channelWidth != 22)
     {
       //avoid to use legacy rate adaptation algorithms for IEEE 802.11n/ac
       channelWidth = 20;
--- a/src/wifi/model/ideal-wifi-manager.cc	Sat Sep 05 13:37:30 2015 +0200
+++ b/src/wifi/model/ideal-wifi-manager.cc	Sat Sep 05 15:53:37 2015 +0200
@@ -170,7 +170,7 @@
         }
     }
   uint32_t channelWidth = GetChannelWidth (station);
-  if (channelWidth >= 40)
+  if (channelWidth > 20 && channelWidth != 22)
     {
       //avoid to use legacy rate adaptation algorithms for IEEE 802.11n/ac
       channelWidth = 20;
@@ -199,7 +199,7 @@
         }
     }
   uint32_t channelWidth = GetChannelWidth (station);
-  if (channelWidth >= 40)
+  if (channelWidth > 20 && channelWidth != 22)
     {
       //avoid to use legacy rate adaptation algorithms for IEEE 802.11n/ac
       channelWidth = 20;
--- a/src/wifi/model/minstrel-wifi-manager.cc	Sat Sep 05 13:37:30 2015 +0200
+++ b/src/wifi/model/minstrel-wifi-manager.cc	Sat Sep 05 15:53:37 2015 +0200
@@ -475,7 +475,7 @@
 {
   MinstrelWifiRemoteStation *station = (MinstrelWifiRemoteStation *) st;
   uint32_t channelWidth = GetChannelWidth (station);
-  if (channelWidth >= 40)
+  if (channelWidth > 20 && channelWidth != 22)
     {
       //avoid to use legacy rate adaptation algorithms for IEEE 802.11n/ac
       channelWidth = 20;
@@ -497,7 +497,7 @@
   MinstrelWifiRemoteStation *station = (MinstrelWifiRemoteStation *) st;
   NS_LOG_DEBUG ("DoGetRtsMode m_txrate=" << station->m_txrate);
   uint32_t channelWidth = GetChannelWidth (station);
-  if (channelWidth >= 40)
+  if (channelWidth > 20 && channelWidth != 22)
     {
       //avoid to use legacy rate adaptation algorithms for IEEE 802.11n/ac
       channelWidth = 20;
--- a/src/wifi/model/onoe-wifi-manager.cc	Sat Sep 05 13:37:30 2015 +0200
+++ b/src/wifi/model/onoe-wifi-manager.cc	Sat Sep 05 15:53:37 2015 +0200
@@ -279,7 +279,7 @@
         }
     }
   uint32_t channelWidth = GetChannelWidth (station);
-  if (channelWidth >= 40)
+  if (channelWidth > 20 && channelWidth != 22)
     {
       //avoid to use legacy rate adaptation algorithms for IEEE 802.11n/ac
       channelWidth = 20;
@@ -292,7 +292,7 @@
 {
   OnoeWifiRemoteStation *station = (OnoeWifiRemoteStation *)st;
   uint32_t channelWidth = GetChannelWidth (station);
-  if (channelWidth >= 40)
+  if (channelWidth > 20 && channelWidth != 22)
     {
       //avoid to use legacy rate adaptation algorithms for IEEE 802.11n/ac
       channelWidth = 20;
--- a/src/wifi/model/parf-wifi-manager.cc	Sat Sep 05 13:37:30 2015 +0200
+++ b/src/wifi/model/parf-wifi-manager.cc	Sat Sep 05 15:53:37 2015 +0200
@@ -295,7 +295,7 @@
   NS_LOG_FUNCTION (this << st << size);
   ParfWifiRemoteStation *station = (ParfWifiRemoteStation *) st;
   uint32_t channelWidth = GetChannelWidth (station);
-  if (channelWidth >= 40)
+  if (channelWidth > 20 && channelWidth != 22)
     {
       //avoid to use legacy rate adaptation algorithms for IEEE 802.11n/ac
       channelWidth = 20;
@@ -312,7 +312,7 @@
   /// RTS only by picking a single rate within the BasicRateSet.
   ParfWifiRemoteStation *station = (ParfWifiRemoteStation *) st;
   uint32_t channelWidth = GetChannelWidth (station);
-  if (channelWidth >= 40)
+  if (channelWidth > 20 && channelWidth != 22)
     {
       //avoid to use legacy rate adaptation algorithms for IEEE 802.11n/ac
       channelWidth = 20;
--- a/src/wifi/model/rraa-wifi-manager.cc	Sat Sep 05 13:37:30 2015 +0200
+++ b/src/wifi/model/rraa-wifi-manager.cc	Sat Sep 05 15:53:37 2015 +0200
@@ -287,7 +287,7 @@
 {
   RraaWifiRemoteStation *station = (RraaWifiRemoteStation *) st;
   uint32_t channelWidth = GetChannelWidth (station);
-  if (channelWidth >= 40)
+  if (channelWidth > 20 && channelWidth != 22)
     {
       //avoid to use legacy rate adaptation algorithms for IEEE 802.11n/ac
       channelWidth = 20;
@@ -304,7 +304,7 @@
 {
   RraaWifiRemoteStation *station = (RraaWifiRemoteStation *) st;
   uint32_t channelWidth = GetChannelWidth (station);
-  if (channelWidth >= 40)
+  if (channelWidth > 20 && channelWidth != 22)
     {
       //avoid to use legacy rate adaptation algorithms for IEEE 802.11n/ac
       channelWidth = 20;
ns-3.24