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.
_Mhz --> _MHZ in WIFI_PHY_STANDARD enums
authorNicola Baldo <nbaldo@cttc.es>
Mon, 12 Sep 2011 11:49:53 +0200
changeset 7482 35c01487f7f7
parent 7481 e52db23c9c8b
child 7483 cbab8818f856
_Mhz --> _MHZ in WIFI_PHY_STANDARD enums
src/wifi/model/regular-wifi-mac.cc file | annotate | diff | comparison | revisions
src/wifi/model/wifi-mac.cc file | annotate | diff | comparison | revisions
src/wifi/model/wifi-phy-standard.h file | annotate | diff | comparison | revisions
src/wifi/model/yans-wifi-phy.cc file | annotate | diff | comparison | revisions 
--- a/src/wifi/model/regular-wifi-mac.cc	Thu Sep 08 18:24:47 2011 -0700
+++ b/src/wifi/model/regular-wifi-mac.cc	Mon Sep 12 11:49:53 2011 +0200
@@ -658,8 +658,8 @@
     case WIFI_PHY_STANDARD_holland:
     case WIFI_PHY_STANDARD_80211a:
     case WIFI_PHY_STANDARD_80211g:
-    case WIFI_PHY_STANDARD_80211_10Mhz:
-    case WIFI_PHY_STANDARD_80211_5Mhz:
+    case WIFI_PHY_STANDARD_80211_10MHZ:
+    case WIFI_PHY_STANDARD_80211_5MHZ:
       cwmin = 15;
       cwmax = 1023;
       break;
--- a/src/wifi/model/wifi-mac.cc	Thu Sep 08 18:24:47 2011 -0700
+++ b/src/wifi/model/wifi-mac.cc	Mon Sep 12 11:49:53 2011 +0200
@@ -271,10 +271,10 @@
     case WIFI_PHY_STANDARD_80211g:
       Configure80211g ();
       break;
-    case WIFI_PHY_STANDARD_80211_10Mhz:
+    case WIFI_PHY_STANDARD_80211_10MHZ:
       Configure80211_10Mhz ();
       break;
-    case WIFI_PHY_STANDARD_80211_5Mhz:
+    case WIFI_PHY_STANDARD_80211_5MHZ:
       Configure80211_5Mhz ();
       break;
     case WIFI_PHY_STANDARD_holland:
--- a/src/wifi/model/wifi-phy-standard.h	Thu Sep 08 18:24:47 2011 -0700
+++ b/src/wifi/model/wifi-phy-standard.h	Mon Sep 12 11:49:53 2011 +0200
@@ -36,9 +36,9 @@
   /** ERP-OFDM PHY (Clause 19, Section 19.5) */
   WIFI_PHY_STANDARD_80211g,
   /** OFDM PHY for the 5 GHz band (Clause 17 with 10 MHz channel bandwidth) */
-  WIFI_PHY_STANDARD_80211_10Mhz,
+  WIFI_PHY_STANDARD_80211_10MHZ,
   /** OFDM PHY for the 5 GHz band (Clause 17 with 5 MHz channel bandwidth) */
-  WIFI_PHY_STANDARD_80211_5Mhz,
+  WIFI_PHY_STANDARD_80211_5MHZ,
   /** This is intended to be the configuration used in this paper:
    *  Gavin Holland, Nitin Vaidya and Paramvir Bahl, "A Rate-Adaptive
    *  MAC Protocol for Multi-Hop Wireless Networks", in Proc. of
--- a/src/wifi/model/yans-wifi-phy.cc	Thu Sep 08 18:24:47 2011 -0700
+++ b/src/wifi/model/yans-wifi-phy.cc	Mon Sep 12 11:49:53 2011 +0200
@@ -166,10 +166,10 @@
     case WIFI_PHY_STANDARD_80211g:
       Configure80211g ();
       break;
-    case WIFI_PHY_STANDARD_80211_10Mhz:
+    case WIFI_PHY_STANDARD_80211_10MHZ:
       Configure80211_10Mhz ();
       break;
-    case WIFI_PHY_STANDARD_80211_5Mhz:
+    case WIFI_PHY_STANDARD_80211_5MHZ:
       Configure80211_5Mhz ();
       break;
     case WIFI_PHY_STANDARD_holland:
ns-3.24