From a002d275824de4edd4f76ea40699389535de27ea Mon Sep 17 00:00:00 2001
From: Nicola Baldo <nbaldo@cttc.es>
Date: Fri, 13 May 2011 17:40:37 +0200
Subject: [PATCH] Bug 1142 - Wrong 802.11p Slot time

---
 src/wifi/model/wifi-mac.cc | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/src/wifi/model/wifi-mac.cc b/src/wifi/model/wifi-mac.cc
index 69831a3b1..61208d65c 100644
--- a/src/wifi/model/wifi-mac.cc
+++ b/src/wifi/model/wifi-mac.cc
@@ -352,23 +352,13 @@ WifiMac::Configure80211_5Mhz (void)
 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