F5/unison
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

_Mhz --> _MHZ in WIFI_PHY_STANDARD enums

Browse Source
This commit is contained in:
Nicola Baldo
2011-09-12 11:49:53 +02:00
parent e031109b49
commit 98ca3155ac
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/wifi/model/regular-wifi-mac.cc
View File

@@ -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;

4
src/wifi/model/wifi-mac.cc
View File

@@ -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:

4
src/wifi/model/wifi-phy-standard.h
View File

@@ -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

4
src/wifi/model/yans-wifi-phy.cc
View File

@@ -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: