From 418fa0a523d71d60817e452600b548f74b01eec3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Deronne?= Date: Tue, 12 Jul 2016 21:35:20 +0200 Subject: [PATCH] wifi: (fixes #1579) Final fix for segfault caused by EDCA fragmentation --- src/wifi/model/edca-txop-n.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/wifi/model/edca-txop-n.cc b/src/wifi/model/edca-txop-n.cc index 1e312c800..a7b9cd8ae 100644 --- a/src/wifi/model/edca-txop-n.cc +++ b/src/wifi/model/edca-txop-n.cc @@ -552,7 +552,7 @@ EdcaTxopN::NotifyAccessGranted (void) params.EnableAck (); } if (((m_currentHdr.IsQosData () && !m_currentHdr.IsQosAmsdu ()) - ||(m_currentHdr.IsData () && !m_currentHdr.IsQosData () && m_currentHdr.IsQosAmsdu ())) + || (m_currentHdr.IsData () && !m_currentHdr.IsQosData ())) && (m_blockAckThreshold == 0 || m_blockAckType == BASIC_BLOCK_ACK) && NeedFragmentation ()) {