Bug 1579 - edca-txop-n fragmentation causes segfault

2013-04-23 10:29:16 -04:00
parent cd6f68ba0a
commit 7ef4ed658a
2 changed files with 4 additions and 1 deletions
--- a/1
+++ b/1
@@ -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
 ------------
--- 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))
        {