From 78251108a1b11b46cd1999b09d36e55196f47f3e Mon Sep 17 00:00:00 2001
From: Stefano Avallone <stavallo@unina.it>
Date: Sat, 1 Feb 2020 13:01:58 +0100
Subject: [PATCH] wifi: Fix valgrind issues with tests

---
 src/wifi/test/block-ack-test-suite.cc        | 4 +++-
 src/wifi/test/channel-access-manager-test.cc | 9 +--------
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/src/wifi/test/block-ack-test-suite.cc b/src/wifi/test/block-ack-test-suite.cc
index 7521d61dc..ffaed3c67 100644
--- a/src/wifi/test/block-ack-test-suite.cc
+++ b/src/wifi/test/block-ack-test-suite.cc
@@ -290,7 +290,9 @@ OriginatorBlockAckWindowTest::DoRun (void)
     }
 
   // Notify the acknowledgment of 5 packets
-  Ptr<WifiMacQueueItem> mpdu = Create<WifiMacQueueItem> (Create<Packet> (), WifiMacHeader ());
+  WifiMacHeader hdr;
+  hdr.SetType (WIFI_MAC_QOSDATA);
+  Ptr<WifiMacQueueItem> mpdu = Create<WifiMacQueueItem> (Create<Packet> (), hdr);
   uint16_t seqNumber = startingSeq;
   mpdu->GetHeader ().SetSequenceNumber (seqNumber);
   agreement.NotifyAckedMpdu (mpdu);
diff --git a/src/wifi/test/channel-access-manager-test.cc b/src/wifi/test/channel-access-manager-test.cc
index ce3befe15..cea1ab5e9 100644
--- a/src/wifi/test/channel-access-manager-test.cc
+++ b/src/wifi/test/channel-access-manager-test.cc
@@ -531,18 +531,11 @@ ChannelAccessManagerTest<TxopType>::EndTest (void)
       NS_TEST_EXPECT_MSG_EQ (state->m_expectedGrants.empty (), true, "Have no expected grants");
       NS_TEST_EXPECT_MSG_EQ (state->m_expectedInternalCollision.empty (), true, "Have no internal collisions");
       NS_TEST_EXPECT_MSG_EQ (state->m_expectedBackoff.empty (), true, "Have no expected backoffs");
+      state->Dispose ();
       state = 0;
     }
   m_txop.clear ();
 
-  for (typename TxopTests::const_iterator i = m_txop.begin (); i != m_txop.end (); i++)
-    {
-      Ptr<TxopTest<TxopType>> txop = *i;
-      txop->Dispose ();
-      txop = 0;
-    }
-  m_txop.clear ();
-
   m_ChannelAccessManager = 0;
   m_low = 0;
 }