From 7ef4ed658a294622cbd75ca1fab7972a91b7d1ef Mon Sep 17 00:00:00 2001 From: Daniel Lertpratchya Date: Tue, 23 Apr 2013 10:29:16 -0400 Subject: [PATCH] Bug 1579 - edca-txop-n fragmentation causes segfault --- RELEASE_NOTES | 1 + src/wifi/model/edca-txop-n.cc | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/RELEASE_NOTES b/RELEASE_NOTES index 7fd5f7368..6eb260ccd 100644 --- a/RELEASE_NOTES +++ b/RELEASE_NOTES @@ -40,6 +40,7 @@ Bugs fixed - Bug 1601 - RttEstimator doesn't set the m_currentEstimatedRtt to m_initialEstimatedRtt on creation - Bug 1612 - pyviz (visualizer) will not be installed - Bug 1623 - pybindgen rev809 is not able to build after Ubuntu 1210 +- Bug 1579 - edca-txop-n fragmentation causes segfault Known issues ------------ diff --git a/src/wifi/model/edca-txop-n.cc b/src/wifi/model/edca-txop-n.cc index 9772de326..c03bb40b8 100644 --- a/src/wifi/model/edca-txop-n.cc +++ b/src/wifi/model/edca-txop-n.cc @@ -415,7 +415,9 @@ EdcaTxopN::NotifyAccessGranted (void) } if (NeedFragmentation () && ((m_currentHdr.IsQosData () && !m_currentHdr.IsQosAmsdu ()) - || m_currentHdr.IsData ()) + || + (m_currentHdr.IsData () + && !m_currentHdr.IsQosData () && m_currentHdr.IsQosAmsdu ())) && (m_blockAckThreshold == 0 || m_blockAckType == BASIC_BLOCK_ACK)) {