From b38935c93f75184a2347a8d53dec298a8f921a3e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Deronne?= Date: Wed, 6 May 2015 23:14:06 +0200 Subject: [PATCH] Bug 2004 [wifi] - Wrong timeout calculation for 802.11n in WifiMac --- RELEASE_NOTES | 1 + src/wifi/model/wifi-mac.cc | 4 ---- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/RELEASE_NOTES b/RELEASE_NOTES index ab2703c4a..9ed4592bf 100644 --- a/RELEASE_NOTES +++ b/RELEASE_NOTES @@ -35,6 +35,7 @@ Bugs fixed - Bug 1757 - RLC AM not using NACK_SN - Bug 1974 - CalculateTxTime should return a Time, not a double - Bug 1982 - AODV and mesh use random variables before seed can be set +- Bug 2004 - Wrong timeout calculation for 802.11n in WifiMac - Bug 2008 - (lr-wpan) Crash if ending rx while status change is in progress - Bug 2025 - (lr-wpan) Changing the channel doesn't affect the Tx params - Bug 2034 - (lr-wpan) CSMA-CA BackoffPeriod is too short diff --git a/src/wifi/model/wifi-mac.cc b/src/wifi/model/wifi-mac.cc index 3131cf47a..123dd1be6 100644 --- a/src/wifi/model/wifi-mac.cc +++ b/src/wifi/model/wifi-mac.cc @@ -374,8 +374,6 @@ WifiMac::Configure80211n_2_4Ghz (void) { Configure80211g (); SetRifs(MicroSeconds (2)); - SetCtsTimeout (MicroSeconds (10 + 52 + 20 + GetDefaultMaxPropagationDelay ().GetMicroSeconds () * 2)); - SetAckTimeout (MicroSeconds (10 + 52 + 20 + GetDefaultMaxPropagationDelay ().GetMicroSeconds () * 2)); SetBasicBlockAckTimeout (GetSifs () + GetSlot () + GetDefaultBasicBlockAckDelay () + GetDefaultMaxPropagationDelay () * 2); SetCompressedBlockAckTimeout (GetSifs () + GetSlot () + GetDefaultCompressedBlockAckDelay () + GetDefaultMaxPropagationDelay () * 2); } @@ -384,8 +382,6 @@ WifiMac::Configure80211n_5Ghz (void) { Configure80211a (); SetRifs(MicroSeconds (2)); - SetCtsTimeout (MicroSeconds (10 + 52 + 20 + GetDefaultMaxPropagationDelay ().GetMicroSeconds () * 2)); - SetAckTimeout (MicroSeconds (10 + 52 + 20 + GetDefaultMaxPropagationDelay ().GetMicroSeconds () * 2)); SetBasicBlockAckTimeout (GetSifs () + GetSlot () + GetDefaultBasicBlockAckDelay () + GetDefaultMaxPropagationDelay () * 2); SetCompressedBlockAckTimeout (GetSifs () + GetSlot () + GetDefaultCompressedBlockAckDelay () + GetDefaultMaxPropagationDelay () * 2); }