From 98ca3155ac6a0fa53d3bc312a78b530f381d45a2 Mon Sep 17 00:00:00 2001
From: Nicola Baldo <nbaldo@cttc.es>
Date: Mon, 12 Sep 2011 11:49:53 +0200
Subject: [PATCH] _Mhz --> _MHZ in WIFI_PHY_STANDARD enums

---
 src/wifi/model/regular-wifi-mac.cc | 4 ++--
 src/wifi/model/wifi-mac.cc         | 4 ++--
 src/wifi/model/wifi-phy-standard.h | 4 ++--
 src/wifi/model/yans-wifi-phy.cc    | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/wifi/model/regular-wifi-mac.cc b/src/wifi/model/regular-wifi-mac.cc
index cfe325f62..e93a525eb 100644
--- a/src/wifi/model/regular-wifi-mac.cc
+++ b/src/wifi/model/regular-wifi-mac.cc
@@ -658,8 +658,8 @@ RegularWifiMac::FinishConfigureStandard (enum WifiPhyStandard standard)
     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 --git a/src/wifi/model/wifi-mac.cc b/src/wifi/model/wifi-mac.cc
index 45d7542ce..9a956a66f 100644
--- a/src/wifi/model/wifi-mac.cc
+++ b/src/wifi/model/wifi-mac.cc
@@ -271,10 +271,10 @@ WifiMac::ConfigureStandard (enum WifiPhyStandard standard)
     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 --git a/src/wifi/model/wifi-phy-standard.h b/src/wifi/model/wifi-phy-standard.h
index 03daf3e03..99a60de2f 100644
--- a/src/wifi/model/wifi-phy-standard.h
+++ b/src/wifi/model/wifi-phy-standard.h
@@ -36,9 +36,9 @@ enum WifiPhyStandard
   /** 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 --git a/src/wifi/model/yans-wifi-phy.cc b/src/wifi/model/yans-wifi-phy.cc
index 586aa4e95..b36d44431 100644
--- a/src/wifi/model/yans-wifi-phy.cc
+++ b/src/wifi/model/yans-wifi-phy.cc
@@ -166,10 +166,10 @@ YansWifiPhy::ConfigureStandard (enum WifiPhyStandard standard)
     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: