F5/unison
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

wifi: Make sure headers are not added to m_currentPacket in MacLow

Browse Source
This commit is contained in:
Sébastien Deronne
2016-12-07 21:48:55 +01:00
parent d723ba0485
commit 7ba521e918
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/wifi/model/mac-low.cc
View File

@@ -1878,15 +1878,15 @@ MacLow::SendDataPacket (void)
}
}
m_currentHdr.SetDuration (duration);
Ptr <Packet> 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> 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