From d79d1d9681fc7f2a204bad0e832a120d79a97548 Mon Sep 17 00:00:00 2001 From: Tom Henderson Date: Fri, 24 Feb 2017 14:40:03 +0100 Subject: [PATCH] traffic-control: (fixes #2660) TrafficControlHelper::Default should not configure internal queue sizes --- RELEASE_NOTES | 1 + src/traffic-control/helper/traffic-control-helper.cc | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/RELEASE_NOTES b/RELEASE_NOTES index 3829946e0..bc9f763b6 100644 --- a/RELEASE_NOTES +++ b/RELEASE_NOTES @@ -89,6 +89,7 @@ Bugs fixed - Bug 2629 - Assert failure in MinstrelHtWifiManager::GetLowestIndex - Bug 2647 - ideal-wifi-manager-example crashes when NSS > 1 - Bug 2655 - A-MPDU simulation using TCP sometimes fails with message "Packet has no Traffic ID" +- Bug 2660 - TrafficControlHelper::Default should not configure internal queue sizes Known issues ------------ diff --git a/src/traffic-control/helper/traffic-control-helper.cc b/src/traffic-control/helper/traffic-control-helper.cc index fc57eb1fb..48efdc2cc 100644 --- a/src/traffic-control/helper/traffic-control-helper.cc +++ b/src/traffic-control/helper/traffic-control-helper.cc @@ -110,8 +110,7 @@ TrafficControlHelper TrafficControlHelper::Default (void) { TrafficControlHelper helper; - uint16_t handle = helper.SetRootQueueDisc ("ns3::PfifoFastQueueDisc"); - helper.AddInternalQueues (handle, 3, "ns3::DropTailQueue", "MaxPackets", UintegerValue (1000)); + helper.SetRootQueueDisc ("ns3::PfifoFastQueueDisc"); return helper; }