From 7ba521e9187187ce4a6bd84dfd1103fa507e2766 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Deronne?= Date: Wed, 7 Dec 2016 21:48:55 +0100 Subject: [PATCH] wifi: Make sure headers are not added to m_currentPacket in MacLow --- src/wifi/model/mac-low.cc | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/wifi/model/mac-low.cc b/src/wifi/model/mac-low.cc index c2e951e28..0b0eedfda 100644 --- a/src/wifi/model/mac-low.cc +++ b/src/wifi/model/mac-low.cc @@ -1878,15 +1878,15 @@ MacLow::SendDataPacket (void) } } m_currentHdr.SetDuration (duration); - + Ptr packet = m_currentPacket->Copy (); if (!m_ampdu) { - m_currentPacket->AddHeader (m_currentHdr); + packet->AddHeader (m_currentHdr); WifiMacTrailer fcs; - m_currentPacket->AddTrailer (fcs); + packet->AddTrailer (fcs); } - ForwardDown (m_currentPacket, &m_currentHdr, m_currentTxVector); + ForwardDown (packet, &m_currentHdr, m_currentTxVector); } bool @@ -2080,15 +2080,15 @@ MacLow::SendDataAfterCts (Mac48Address source, Time duration) duration = std::max (duration, newDuration); NS_ASSERT (duration >= MicroSeconds (0)); m_currentHdr.SetDuration (duration); - + Ptr packet = m_currentPacket->Copy (); if (!m_ampdu) { - m_currentPacket->AddHeader (m_currentHdr); + packet->AddHeader (m_currentHdr); WifiMacTrailer fcs; - m_currentPacket->AddTrailer (fcs); + packet->AddTrailer (fcs); } - ForwardDown (m_currentPacket, &m_currentHdr, m_currentTxVector); + ForwardDown (packet, &m_currentHdr, m_currentTxVector); } void