--- a/RELEASE_NOTES	Wed May 06 22:07:40 2015 +0200
+++ b/RELEASE_NOTES	Wed May 06 23:14:06 2015 +0200
@@ -35,6 +35,7 @@
 - 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 

--- a/src/wifi/model/wifi-mac.cc	Wed May 06 22:07:40 2015 +0200
+++ b/src/wifi/model/wifi-mac.cc	Wed May 06 23:14:06 2015 +0200
@@ -374,8 +374,6 @@
 {
   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 @@
 {
   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);
 }