From 2085e8ee6bfe075026c16809adfacbb0926b57a8 Mon Sep 17 00:00:00 2001
From: John Southworth <john.southworth@vyatta.com>
Date: Fri, 17 Aug 2012 15:49:34 -0700
Subject: Fix a few priority-queue problems

   Priority queue automatically creates classes 1:[1-7] so we have to
   use these as our classes.

   Default class needs to be in the priomap (this is ugly, but it works
   there must be a better way)
---
 lib/Vyatta/Qos/Priority.pm | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

(limited to 'lib')

diff --git a/lib/Vyatta/Qos/Priority.pm b/lib/Vyatta/Qos/Priority.pm
index b148b1c..4b7654d 100644
--- a/lib/Vyatta/Qos/Priority.pm
+++ b/lib/Vyatta/Qos/Priority.pm
@@ -85,29 +85,27 @@ sub commands {
         # find largest class id
 	$maxid = $class->{id}
         if ( defined $class->{id} && $class->{id} > $maxid );
-
-	# find largest priority
-	my $prio = $class->{_priority};
-
-	$bands = $prio + 1
-	    if ( defined $prio && $prio >= $bands);
     }
 
     # fill in id of default
     $default->{id} = ++$maxid;
+    $bands = $default->{id};
     unshift @$classes, $default;
 
     my $parent = 1;
     my $root   = "root";
 
+    my $def_prio = $bands - 1;
     # Since we use filters to set priority 
-    printf "qdisc add dev %s %s handle %x: prio bands %d\n",
-	$dev, $root, $parent, $bands;
+    printf "qdisc add dev %s %s handle %x: prio bands %d priomap %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d\n",
+	$dev, $root, $parent, $bands, 
+        $def_prio, $def_prio, $def_prio, $def_prio, $def_prio, $def_prio, $def_prio,
+        $def_prio, $def_prio, $def_prio, $def_prio, $def_prio, $def_prio, $def_prio, 
+        $def_prio, $def_prio, $def_prio;
 
     # prio is not really classful!
     foreach my $class (@$classes) {
-        $class->gen_leaf( $dev, $parent );
-
+	$class->gen_leaf( $dev, $parent );
 	my $prio = 1;
         foreach my $match ( $class->matchRules() ) {
             $match->filter( $dev, $parent, $class->{id}, $prio++ );
-- 
cgit v1.2.3