From 9b73661ef89a10701cc8f4714363f4fff704085f Mon Sep 17 00:00:00 2001 From: Andrey Mazo Date: Mon, 19 Aug 2013 18:30:18 +0200 Subject: [PATCH] bug 1584: Association Request Timeouts not canceled. - Fixed copy-paste error in 831ad8abd1c0. --- RELEASE_NOTES | 1 + src/wifi/model/sta-wifi-mac.cc | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/RELEASE_NOTES b/RELEASE_NOTES index 309edd0a1..91a508dfe 100644 --- a/RELEASE_NOTES +++ b/RELEASE_NOTES @@ -54,6 +54,7 @@ Bugs fixed - 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 diff --git a/src/wifi/model/sta-wifi-mac.cc b/src/wifi/model/sta-wifi-mac.cc index d7a85f7b7..aafec75a8 100644 --- a/src/wifi/model/sta-wifi-mac.cc +++ b/src/wifi/model/sta-wifi-mac.cc @@ -183,9 +183,9 @@ StaWifiMac::SendProbeRequest (void) // 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);