bug 381: Wifi crashes on shutdown
authorMathieu Lacage <mathieu.lacage@sophia.inria.fr>
Thu Jul 16 12:31:26 2009 +0200 (6 months ago)
changeset 470702bf728f7e39
parent 4706 f17f12944235
child 4708 840515a00b38
child 4710 86343f7d6bfd
bug 381: Wifi crashes on shutdown
src/devices/wifi/nqap-wifi-mac.cc
src/devices/wifi/nqsta-wifi-mac.cc
src/devices/wifi/qap-wifi-mac.cc
src/devices/wifi/qsta-wifi-mac.cc
     1.1 --- a/src/devices/wifi/nqap-wifi-mac.cc	Thu Jul 16 13:51:12 2009 +0400
     1.2 +++ b/src/devices/wifi/nqap-wifi-mac.cc	Thu Jul 16 12:31:26 2009 +0200
     1.3 @@ -97,6 +97,7 @@
     1.4    NS_LOG_FUNCTION (this);
     1.5    delete m_rxMiddle;
     1.6    delete m_dcfManager;
     1.7 +  m_low->Dispose ();
     1.8    m_rxMiddle = 0;
     1.9    m_low = 0;
    1.10    m_dcfManager = 0;
     2.1 --- a/src/devices/wifi/nqsta-wifi-mac.cc	Thu Jul 16 13:51:12 2009 +0400
     2.2 +++ b/src/devices/wifi/nqsta-wifi-mac.cc	Thu Jul 16 12:31:26 2009 +0200
     2.3 @@ -128,6 +128,7 @@
     2.4    NS_LOG_FUNCTION (this);
     2.5    delete m_rxMiddle;
     2.6    delete m_dcfManager;
     2.7 +  m_low->Dispose ();
     2.8    m_rxMiddle = 0;
     2.9    m_low = 0;
    2.10    m_dcfManager = 0;
     3.1 --- a/src/devices/wifi/qap-wifi-mac.cc	Thu Jul 16 13:51:12 2009 +0400
     3.2 +++ b/src/devices/wifi/qap-wifi-mac.cc	Thu Jul 16 12:31:26 2009 +0200
     3.3 @@ -119,10 +119,11 @@
     3.4  QapWifiMac::DoDispose ()
     3.5  {
     3.6    delete m_rxMiddle;
     3.7 +  delete m_txMiddle;
     3.8 +  delete m_dcfManager;
     3.9 +  m_low->Dispose ();
    3.10    m_rxMiddle = 0;
    3.11 -  delete m_txMiddle;
    3.12    m_txMiddle = 0;
    3.13 -  delete m_dcfManager;
    3.14    m_dcfManager = 0;
    3.15    m_low = 0;
    3.16    m_phy = 0;
     4.1 --- a/src/devices/wifi/qsta-wifi-mac.cc	Thu Jul 16 13:51:12 2009 +0400
     4.2 +++ b/src/devices/wifi/qsta-wifi-mac.cc	Thu Jul 16 12:31:26 2009 +0200
     4.3 @@ -125,6 +125,7 @@
     4.4    delete m_rxMiddle;
     4.5    delete m_txMiddle;
     4.6    delete m_dcfManager;
     4.7 +  m_low->Dispose ();
     4.8    m_rxMiddle = 0;
     4.9    m_txMiddle = 0;
    4.10    m_low = 0;