From e6eafcc5c3251c2c1afa9cc3b0638be442856fca Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Tue, 16 Jun 2009 16:25:22 -0700 Subject: Don't allow random-detect type for round-robin queue type Random detect requires bandwidth which is not part of round robin policy. Therefore drop it as a configurable value. Bug 4595 (cherry picked from commit b1b823012b2a1aa0fa8578054fc1179f92a32c2f) --- .../round-robin/node.tag/class/node.tag/queue-type/node.def | 4 +--- templates/qos-policy/round-robin/node.tag/default/queue-type/node.def | 3 +-- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/templates/qos-policy/round-robin/node.tag/class/node.tag/queue-type/node.def b/templates/qos-policy/round-robin/node.tag/class/node.tag/queue-type/node.def index 8df453b..ecbcede 100644 --- a/templates/qos-policy/round-robin/node.tag/class/node.tag/queue-type/node.def +++ b/templates/qos-policy/round-robin/node.tag/class/node.tag/queue-type/node.def @@ -1,10 +1,8 @@ type: txt default: "drop-tail" -syntax:expression: $VAR(@) in "fair-queue", "priority", "drop-tail", "random-detect"; "Unknown queue-type" +syntax:expression: $VAR(@) in "fair-queue", "priority", "drop-tail"; "Unknown queue-type" help: Set the queue type for this class comp_help:Possible completions fair-queue\tStochastic Fair Queue (SFQ) drop-tail\tFirst-In-First-Out (FIFO) priority\tPriority queueing based on DSCP - random-detect\tRandom Early Detection (RED) - diff --git a/templates/qos-policy/round-robin/node.tag/default/queue-type/node.def b/templates/qos-policy/round-robin/node.tag/default/queue-type/node.def index 295c04c..61f9506 100644 --- a/templates/qos-policy/round-robin/node.tag/default/queue-type/node.def +++ b/templates/qos-policy/round-robin/node.tag/default/queue-type/node.def @@ -1,10 +1,9 @@ type: txt default: "fair-queue" -syntax:expression: $VAR(@) in "fair-queue", "priority", "drop-tail", "random-detect"; "Unknown queue-type" +syntax:expression: $VAR(@) in "fair-queue", "priority", "drop-tail"; "Unknown queue-type" help: Set the queue type for this class comp_help:Possible completions fair-queue\tStochastic Fair Queue (SFQ) drop-tail\tFirst-In-First-Out (FIFO) priority\tPriority queueing based on DSCP - random-detect\tRandom Early Detection (RED) -- cgit v1.2.3