diff options
| author | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2010-07-20 15:17:01 -0700 |
|---|---|---|
| committer | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2010-07-20 15:17:01 -0700 |
| commit | 8c2f55a31a1c735fb4ecc1daa5fac72764e0cbb0 (patch) | |
| tree | 893a8bebeb0b7961c47db5dcd95d0e570b5ecb52 | |
| parent | c9f59a65539b76bf865cabb0991558422cde09ec (diff) | |
| parent | d05887ea055bec73773f71edec4f88491b0b9043 (diff) | |
| download | vyatta-cfg-qos-8c2f55a31a1c735fb4ecc1daa5fac72764e0cbb0.tar.gz vyatta-cfg-qos-8c2f55a31a1c735fb4ecc1daa5fac72764e0cbb0.zip | |
Merge branch 'larkspur' of vm:git/vyatta-cfg-qos into larkspur
| -rw-r--r-- | lib/Vyatta/Qos/ShaperClass.pm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/Vyatta/Qos/ShaperClass.pm b/lib/Vyatta/Qos/ShaperClass.pm index 464c58d..a495863 100644 --- a/lib/Vyatta/Qos/ShaperClass.pm +++ b/lib/Vyatta/Qos/ShaperClass.pm @@ -173,13 +173,13 @@ sub redQdisc { sub redValidate { my ( $self, $level, $rate ) = @_; my $limit = $self->{_limit}; - my $qmax = redQsize($rate); + my $qmax = int((redQsize($rate) + AVGPKT - 1) / AVGPKT); - if ( defined($limit) && $limit * AVGPKT < $qmax ) { + if ( defined($limit) && $limit < $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 / AVGPKT; +"The queue limit (%d) is too small, must be %d or more when using random-detect\n", + $limit, $qmax; exit 1; } |