diff -r 7cc4506fb853 src/wifi/model/wifi-mac.cc --- 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 12:42:54 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