# HG changeset patch
# User Nicola Baldo <nbaldo@cttc.es>
# Date 1315820993 -7200
# Node ID 35c01487f7f7b451c8debe40535c36f9ff466aae
# Parent  e52db23c9c8b70e9efa9331e3b090180d5d03fbf
_Mhz --> _MHZ in WIFI_PHY_STANDARD enums

diff -r e52db23c9c8b -r 35c01487f7f7 src/wifi/model/regular-wifi-mac.cc
--- 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;
diff -r e52db23c9c8b -r 35c01487f7f7 src/wifi/model/wifi-mac.cc
--- 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:
diff -r e52db23c9c8b -r 35c01487f7f7 src/wifi/model/wifi-phy-standard.h
--- 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
diff -r e52db23c9c8b -r 35c01487f7f7 src/wifi/model/yans-wifi-phy.cc
--- 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: