--- a/RELEASE_NOTES	Sun Aug 18 23:14:50 2013 -0700
+++ b/RELEASE_NOTES	Mon Aug 19 18:30:18 2013 +0200
@@ -54,6 +54,7 @@
 - Bug 1296 - Enhancement in Ipv[4,6]RoutingHelper
 - Bug 1390 - ICMPv6 Redirect are handled correctly only for /64 networks
 - Bug 1522 - Hidden node scenario leads to ARP failure
+- Bug 1584 - Old Association Request Timeouts are not canceled
 - Bug 1629 - Make AODV Default to Disable Hello
 - Bug 1643 - NdiscCache creation and existence checks
 - Bug 1646 - ICMPv6 Redirect are sent from global address instead of link-local

--- a/src/wifi/model/sta-wifi-mac.cc	Sun Aug 18 23:14:50 2013 -0700
+++ b/src/wifi/model/sta-wifi-mac.cc	Mon Aug 19 18:30:18 2013 +0200
@@ -183,9 +183,9 @@
   // association or not.
   m_dca->Queue (packet, hdr);
 
-  if (m_assocRequestEvent.IsRunning ())
+  if (m_probeRequestEvent.IsRunning ())
     {
-      m_assocRequestEvent.Cancel ();
+      m_probeRequestEvent.Cancel ();
     }
   m_probeRequestEvent = Simulator::Schedule (m_probeRequestTimeout,
                                              &StaWifiMac::ProbeRequestTimeout, this);