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

3 files changed, 5 insertions, 7 deletions

diff --git a/lib/Vyatta/Qos/Match.pm b/lib/Vyatta/Qos/Match.pm
index dc6f2db..a6b16e9 100644
--- a/lib/Vyatta/Qos/Match.pm
+++ b/lib/Vyatta/Qos/Match.pm
@@ -133,14 +133,12 @@ sub filter {
             my $type = $$p{protocol};
             $type = 'all' unless $type;
 
+	    print " protocol $type u32";
             if ( defined( $$p{src} ) || defined( $$p{dest} ) ) {
-                print " protocol $type u32";
                 print " match ether src $$p{src}" if $$p{src};
                 print " match ether dst $$p{dst}" if $$p{dst};
             } else {
-
-                # u32 requires some options to work but basic works
-                print " protocol $type basic";
+                print " match u32 0 0";
             }
         } else {
             print " protocol all u32";
diff --git a/lib/Vyatta/Qos/RoundRobin.pm b/lib/Vyatta/Qos/RoundRobin.pm
index d9cedfd..07aa8f7 100644
--- a/lib/Vyatta/Qos/RoundRobin.pm
+++ b/lib/Vyatta/Qos/RoundRobin.pm
@@ -82,9 +82,7 @@ sub commands {
     my $classes = $self->{_classes};
     my $parent  = 1;
 
-    printf "qdisc add dev %s root  handle %x: drr", $dev, $parent;
-    print " quantum $self->{_quantum}" if ( $self->{_quantum} );
-    print "\n";
+    printf "qdisc add dev %s root  handle %x: drr\n", $dev, $parent;
 
     foreach my $class (sort { $a->{id} <=> $b->{id} } @$classes) {
         $class->gen_class( $dev, 'drr', $parent );
diff --git a/lib/Vyatta/Qos/ShaperClass.pm b/lib/Vyatta/Qos/ShaperClass.pm
index f895239..b84b057 100644
--- a/lib/Vyatta/Qos/ShaperClass.pm
+++ b/lib/Vyatta/Qos/ShaperClass.pm
@@ -49,6 +49,7 @@ sub new {
         $self->{_qdisc}    = $config->returnValue("queue-type");
         $self->{_avgpkt}   = $config->returnValue("packet-length");
         $self->{_latency}  = $config->returnValue("latency");
+	$self->{_quantum}  = $config->returnValue("quantum");
 
         $self->{dsmark} = getDsfield( $config->returnValue("set-dscp") );
         my @matches = _getMatch("$level match");
@@ -256,6 +257,7 @@ sub gen_class {
     print " ceil $ceil"              if ($ceil);
     print " burst $self->{_burst}"   if ( $self->{_burst} );
     print " prio $self->{_priority}" if ( $self->{_priority} );
+    print " quantum $self->{_quantum}" if ( $self->{_quantum} );
     print "\n";
 }