From b489e5dd2d18c1fb94165be38a475dd18a9007b2 Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Fri, 9 Jul 2010 16:38:30 -0700 Subject: Remove traffic-limiter outbound It won't work because of how classifiers interact with policing. See: http://ace-host.stuart.id.au/russell/files/tc/doc/police.txt --- lib/Vyatta/Qos/TrafficLimiter.pm | 12 +++++------- scripts/vyatta-qos.pl | 1 - 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/lib/Vyatta/Qos/TrafficLimiter.pm b/lib/Vyatta/Qos/TrafficLimiter.pm index 0a5809f..665f784 100644 --- a/lib/Vyatta/Qos/TrafficLimiter.pm +++ b/lib/Vyatta/Qos/TrafficLimiter.pm @@ -85,13 +85,11 @@ sub commands { my $classes = $self->{_classes}; my $parent; - if ($direction eq 'in') { - $parent = 0xffff; - printf "qdisc add dev %s handle %x: ingress\n", $dev, $parent; - } else { - $parent = 1; - printf "qdisc add dev %s handle %x: prio\n", $dev, $parent; - } + die "traffic-policy limiter only applies for incoming traffic\n" + unless ($direction eq 'in'); + + $parent = 0xffff; + printf "qdisc add dev %s handle %x: ingress\n", $dev, $parent; # find largest class id (to use for default) my $maxid = 0; diff --git a/scripts/vyatta-qos.pl b/scripts/vyatta-qos.pl index 266a0f5..b232ae2 100755 --- a/scripts/vyatta-qos.pl +++ b/scripts/vyatta-qos.pl @@ -28,7 +28,6 @@ my $debug = $ENV{'QOS_DEBUG'}; my %policies = ( 'out' => { 'shaper' => 'TrafficShaper', - 'limiter' => 'TrafficLimiter', 'fair-queue' => 'FairQueue', 'rate-control' => 'RateLimiter', 'drop-tail' => 'DropTail', -- cgit v1.2.3