Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code | Sign in
(472)

Unified Diff: src/wifi/model/wifi-mac.cc

Issue 11685043: IEEE 802.11p MAC
Patch Set: updates after midterm review Created 10 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Please Sign in to add in-line comments.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/wifi/model/wifi-mac.h ('k') | src/wifi/model/yans-wifi-phy.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/wifi/model/wifi-mac.cc
===================================================================
--- a/src/wifi/model/wifi-mac.cc
+++ b/src/wifi/model/wifi-mac.cc
@@ -280,12 +280,6 @@
case WIFI_PHY_STANDARD_holland:
Configure80211a ();
break;
- case WIFI_PHY_STANDARD_80211p_CCH:
- Configure80211p_CCH ();
- break;
- case WIFI_PHY_STANDARD_80211p_SCH:
- Configure80211p_SCH ();
- break;
default:
NS_ASSERT (false);
break;
@@ -350,18 +344,6 @@
}
void
-WifiMac::Configure80211p_CCH (void)
-{
- Configure80211_10Mhz ();
-}
-
-void
-WifiMac::Configure80211p_SCH (void)
-{
- Configure80211_10Mhz ();
-}
-
-void
WifiMac::ConfigureDcf (Ptr<Dcf> dcf, uint32_t cwmin, uint32_t cwmax, enum AcIndex ac)
{
/* see IEE802.11 section 7.3.2.29 */
@@ -398,40 +380,4 @@
}
}
-void
-WifiMac::ConfigureCCHDcf (Ptr<Dcf> dcf, uint32_t cwmin, uint32_t cwmax, enum AcIndex ac)
-{
- /* see IEEE 1609.4-2006 section 6.3.1, Table 1 */
- switch (ac)
- {
- case AC_VO:
- dcf->SetMinCw ((cwmin + 1) / 4 - 1);
- dcf->SetMaxCw ((cwmin + 1) / 2 - 1);
- dcf->SetAifsn (2);
- break;
- case AC_VI:
- dcf->SetMinCw ((cwmin + 1) / 4 - 1);
- dcf->SetMaxCw ((cwmin + 1) / 2 - 1);
- dcf->SetAifsn (3);
- break;
- case AC_BE:
- dcf->SetMinCw ((cwmin + 1) / 2 - 1);
- dcf->SetMaxCw (cwmin);
- dcf->SetAifsn (6);
- break;
- case AC_BK:
- dcf->SetMinCw (cwmin);
- dcf->SetMaxCw (cwmax);
- dcf->SetAifsn (9);
- break;
- case AC_BE_NQOS:
- dcf->SetMinCw (cwmin);
- dcf->SetMaxCw (cwmax);
- dcf->SetAifsn (2);
- break;
- case AC_UNDEF:
- NS_FATAL_ERROR ("I don't know what to do with this");
- break;
- }
-}
} // namespace ns3
« no previous file with comments | « src/wifi/model/wifi-mac.h ('k') | src/wifi/model/yans-wifi-phy.cc » ('j') | no next file with comments »

Powered by Google App Engine
RSS Feeds Recent Issues | This issue
This is Rietveld f62528b