Bug 381: Wifi crashes on shutdown
authorfmoatamr
Thu, 10 Dec 2009 12:42:20 +0100
changeset 5846 f7a4e1b3f632
parent 5845 b7248f6ae309
child 5847 e6a70e535416
Bug 381: Wifi crashes on shutdown
src/devices/wifi/mac-low.cc
--- a/src/devices/wifi/mac-low.cc	Thu Dec 10 12:40:07 2009 +0100
+++ b/src/devices/wifi/mac-low.cc	Thu Dec 10 12:42:20 2009 +0100
@@ -303,7 +303,15 @@
 MacLow::DoDispose (void)
 {
   NS_LOG_FUNCTION (this);
-  CancelAllEvents ();
+  m_normalAckTimeoutEvent.Cancel ();
+  m_fastAckTimeoutEvent.Cancel ();
+  m_superFastAckTimeoutEvent.Cancel ();
+  m_fastAckFailedTimeoutEvent.Cancel ();
+  m_ctsTimeoutEvent.Cancel ();
+  m_sendCtsEvent.Cancel ();
+  m_sendAckEvent.Cancel ();
+  m_sendDataEvent.Cancel ();
+  m_waitSifsEvent.Cancel ();
   m_phy = 0;
   m_stationManager = 0;
   delete m_phyMacLowListener;