Mercurial Mercurial > ns-3.24 / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
src/wifi/model/wifi-mac.cc
changeset 7162 c29fbeddbc04
parent 7141 072fb225b714
child 7385 10beb0e53130 
--- a/src/wifi/model/wifi-mac.cc	Fri May 13 00:21:25 2011 -0700
+++ b/src/wifi/model/wifi-mac.cc	Fri May 13 17:40:37 2011 +0200
@@ -352,23 +352,13 @@
 void
 WifiMac::Configure80211p_CCH (void)
 {
-  SetSifs (MicroSeconds (32));
-  SetSlot (MicroSeconds (16));
-  SetEifsNoDifs (MicroSeconds (32 + 88));
-  SetPifs (MicroSeconds (32 + 16));
-  SetCtsTimeout (MicroSeconds (32 + 88 + 16 + GetDefaultMaxPropagationDelay ().GetMicroSeconds () * 2));
-  SetAckTimeout (MicroSeconds (32 + 88 + 16 + GetDefaultMaxPropagationDelay ().GetMicroSeconds () * 2));
+  Configure80211_10Mhz ();
 }
 
 void
 WifiMac::Configure80211p_SCH (void)
 {
-  SetSifs (MicroSeconds (32));
-  SetSlot (MicroSeconds (16));
-  SetEifsNoDifs (MicroSeconds (32 + 88));
-  SetPifs (MicroSeconds (32 + 16));
-  SetCtsTimeout (MicroSeconds (32 + 88 + 16 + GetDefaultMaxPropagationDelay ().GetMicroSeconds () * 2));
-  SetAckTimeout (MicroSeconds (32 + 88 + 16 + GetDefaultMaxPropagationDelay ().GetMicroSeconds () * 2));
+  Configure80211_10Mhz ();
 }
 
 void
ns-3.24