Merge branch 'larkspur' of vm:git/vyatta-cfg-qos into larkspur

1 files changed, 14 insertions, 3 deletions

diff --git a/lib/Vyatta/Qos/ShaperClass.pm b/lib/Vyatta/Qos/ShaperClass.pm
index 439e404..6b474e6 100644
--- a/lib/Vyatta/Qos/ShaperClass.pm
+++ b/lib/Vyatta/Qos/ShaperClass.pm
@@ -117,17 +117,28 @@ sub rateCheck {
         exit 1;
     }
 
-    my $qlimit = $self->{_limit};
-    if (defined($qlimit) && $self->{_qdisc} eq 'random-detect') {
+    if ($self->{_qdisc} eq 'random-detect') {
 	my $avg = 1024;
 	my $qmax = ( $rate * 100 ) / 8000;
-	if ($qlimit * $avg < $qmax) {
+	my $qlimit = $self->{_limit};
+	if (defined($qlimit) && $qlimit * $avg < $qmax) {
 	    print STDERR "Configuration error in: $level\n";
 	    printf STDERR
 "The queue limit (%d) is too small, must be greater than %d when using random-detect\n",
 		$level, $qmax / $avg;
 	    exit 1;
 	}
+
+	# The assumptions about average packet size and allowable latency
+	# result in limit on available bandwidth
+	#
+	# 2 * Avg pkt = (BW * Latency) / 8 bit/byte
+	# 16K bits = BW * .1 sec
+	if ($qmax < $avg) {
+	    print STDERR "Configuration error in: $level\n";
+	    die 
+"Random-detect queue type requires effective bandwidth of 160 Kbit/sec or greater\n";
+	}
     }
 }