regen; queue ID allocation starts at 2 instead of 1 now

9 files changed, 54 insertions, 54 deletions

diff --git a/regress/sbin/pfctl/pfaltq1.ok b/regress/sbin/pfctl/pfaltq1.ok
index be841fffc67..2fcadb7fd56 100644
--- a/regress/sbin/pfctl/pfaltq1.ok
+++ b/regress/sbin/pfctl/pfaltq1.ok
@@ -1,8 +1,8 @@
 queue one priq( default ) 
-[ qid=1 ifname=lo0 ifbandwidth=10Mb ]
+[ qid=2 ifname=lo0 ifbandwidth=10Mb ]
 queue one priq( default ) 
-[ qid=1 ifname=tun0 ifbandwidth=10Mb ]
+[ qid=2 ifname=tun0 ifbandwidth=10Mb ]
 queue two priority 15 
-[ qid=2 ifname=lo0 ifbandwidth=10Mb ]
+[ qid=3 ifname=lo0 ifbandwidth=10Mb ]
 queue two priority 15 
-[ qid=2 ifname=tun0 ifbandwidth=10Mb ]
+[ qid=3 ifname=tun0 ifbandwidth=10Mb ]
diff --git a/regress/sbin/pfctl/pfaltq2.ok b/regress/sbin/pfctl/pfaltq2.ok
index 78eb4e70f69..9486201787d 100644
--- a/regress/sbin/pfctl/pfaltq2.ok
+++ b/regress/sbin/pfctl/pfaltq2.ok
@@ -3,18 +3,18 @@ queue root_lo0 bandwidth 10Mb priority 0 cbq( wrr root ) {one, two}
 queue  one bandwidth 1Mb cbq( default ) 
 [ qid=4294967293 ifname=lo0 ifbandwidth=10Mb ]
 queue  two bandwidth 9Mb {three, four}
-[ qid=1 ifname=lo0 ifbandwidth=10Mb ]
-queue   three bandwidth 4.50Mb 
 [ qid=2 ifname=lo0 ifbandwidth=10Mb ]
-queue   four bandwidth 3.60Mb 
+queue   three bandwidth 4.50Mb 
 [ qid=3 ifname=lo0 ifbandwidth=10Mb ]
+queue   four bandwidth 3.60Mb 
+[ qid=4 ifname=lo0 ifbandwidth=10Mb ]
 queue root_tun0 bandwidth 10Mb priority 0 cbq( wrr root ) {one, two}
 [ qid=4294967294 ifname=tun0 ifbandwidth=10Mb ]
 queue  one bandwidth 1Mb cbq( default ) 
 [ qid=4294967293 ifname=tun0 ifbandwidth=10Mb ]
 queue  two bandwidth 9Mb {three, four}
-[ qid=1 ifname=tun0 ifbandwidth=10Mb ]
-queue   three bandwidth 4.50Mb 
 [ qid=2 ifname=tun0 ifbandwidth=10Mb ]
-queue   four bandwidth 3.60Mb 
+queue   three bandwidth 4.50Mb 
 [ qid=3 ifname=tun0 ifbandwidth=10Mb ]
+queue   four bandwidth 3.60Mb 
+[ qid=4 ifname=tun0 ifbandwidth=10Mb ]
diff --git a/regress/sbin/pfctl/pfaltq3.ok b/regress/sbin/pfctl/pfaltq3.ok
index e6d7e28375c..3c72fd1e10a 100644
--- a/regress/sbin/pfctl/pfaltq3.ok
+++ b/regress/sbin/pfctl/pfaltq3.ok
@@ -3,26 +3,26 @@ queue root_lo0 bandwidth 10Mb priority 0 cbq( wrr root ) {eins, zwei, drei}
 queue  eins bandwidth 1Mb cbq( default ) 
 [ qid=4294967293 ifname=lo0 ifbandwidth=10Mb ]
 queue  zwei bandwidth 8Mb {sub2, sub3}
-[ qid=1 ifname=lo0 ifbandwidth=10Mb ]
-queue   sub2 bandwidth 4Mb 
 [ qid=2 ifname=lo0 ifbandwidth=10Mb ]
-queue   sub3 bandwidth 4Mb 
+queue   sub2 bandwidth 4Mb 
 [ qid=3 ifname=lo0 ifbandwidth=10Mb ]
-queue  drei bandwidth 1Mb {subseven}
+queue   sub3 bandwidth 4Mb 
 [ qid=4 ifname=lo0 ifbandwidth=10Mb ]
+queue  drei bandwidth 1Mb {subseven}
+[ qid=5 ifname=lo0 ifbandwidth=10Mb ]
 queue   subseven bandwidth 900Kb 
-[ qid=6 ifname=lo0 ifbandwidth=10Mb ]
+[ qid=7 ifname=lo0 ifbandwidth=10Mb ]
 queue root_tun0 bandwidth 33.60Kb priority 0 cbq( wrr root ) {zwei, vier, fuenf}
 [ qid=4294967294 ifname=tun0 ifbandwidth=33.60Kb ]
 queue  zwei bandwidth 26.88Kb {sub2, sub3}
-[ qid=1 ifname=tun0 ifbandwidth=33.60Kb ]
-queue   sub2 bandwidth 13.40Kb 
 [ qid=2 ifname=tun0 ifbandwidth=33.60Kb ]
-queue   sub3 bandwidth 13.40Kb 
+queue   sub2 bandwidth 13.40Kb 
 [ qid=3 ifname=tun0 ifbandwidth=33.60Kb ]
+queue   sub3 bandwidth 13.40Kb 
+[ qid=4 ifname=tun0 ifbandwidth=33.60Kb ]
 queue  vier bandwidth 16.80Kb cbq( default ) 
 [ qid=4294967293 ifname=tun0 ifbandwidth=33.60Kb ]
 queue  fuenf bandwidth 16.80Kb {subseven}
-[ qid=5 ifname=tun0 ifbandwidth=33.60Kb ]
-queue   subseven bandwidth 15.12Kb 
 [ qid=6 ifname=tun0 ifbandwidth=33.60Kb ]
+queue   subseven bandwidth 15.12Kb 
+[ qid=7 ifname=tun0 ifbandwidth=33.60Kb ]
diff --git a/regress/sbin/pfctl/pfaltq4.ok b/regress/sbin/pfctl/pfaltq4.ok
index 11fdce10f69..c90d3c4f2e5 100644
--- a/regress/sbin/pfctl/pfaltq4.ok
+++ b/regress/sbin/pfctl/pfaltq4.ok
@@ -3,10 +3,10 @@ queue root_lo0 bandwidth 10Mb priority 0 cbq( wrr root ) {bloody, germans}
 queue  bloody bandwidth 5Mb cbq( default ) 
 [ qid=4294967293 ifname=lo0 ifbandwidth=10Mb ]
 queue  germans bandwidth 5Mb 
-[ qid=1 ifname=lo0 ifbandwidth=10Mb ]
+[ qid=2 ifname=lo0 ifbandwidth=10Mb ]
 queue root_tun0 bandwidth 10Mb priority 0 cbq( wrr root ) {bloody, toads}
 [ qid=4294967294 ifname=tun0 ifbandwidth=10Mb ]
 queue  bloody bandwidth 5Mb cbq( default ) 
 [ qid=4294967293 ifname=tun0 ifbandwidth=10Mb ]
 queue  toads bandwidth 5Mb 
-[ qid=2 ifname=tun0 ifbandwidth=10Mb ]
+[ qid=3 ifname=tun0 ifbandwidth=10Mb ]
diff --git a/regress/sbin/pfctl/pfaltq5.ok b/regress/sbin/pfctl/pfaltq5.ok
index 3b9840eb214..c5ab7ac2e1f 100644
--- a/regress/sbin/pfctl/pfaltq5.ok
+++ b/regress/sbin/pfctl/pfaltq5.ok
@@ -1,18 +1,18 @@
 queue praise priq( default ) 
-[ qid=1 ifname=lo0 ifbandwidth=10Mb ]
-queue wim priority 15 
 [ qid=2 ifname=lo0 ifbandwidth=10Mb ]
-queue hi priority 7 
+queue wim priority 15 
 [ qid=3 ifname=lo0 ifbandwidth=10Mb ]
+queue hi priority 7 
+[ qid=4 ifname=lo0 ifbandwidth=10Mb ]
 @0 pass in on lo0 proto tcp from any to any port = ssh keep state queue(hi, wim) 
 [ Skip steps: d=end f=end p=end sa=end sp=end da=end dp=3 ]
-[ queue: qname=hi qid=3 pqname=wim pqid=2 ]
+[ queue: qname=hi qid=4 pqname=wim pqid=3 ]
 @1 pass in proto tcp from any to any port = ssh keep state queue(hi, wim) 
 [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=3 ]
-[ queue: qname=hi qid=3 pqname=wim pqid=2 ]
+[ queue: qname=hi qid=4 pqname=wim pqid=3 ]
 @2 pass in proto tcp from any to any port = ssh keep state queue wim 
 [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end ]
-[ queue: qname=wim qid=2 pqname= pqid=2 ]
+[ queue: qname=wim qid=3 pqname= pqid=3 ]
 @3 pass in proto tcp from any to any port = smtp keep state queue praise 
 [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ]
-[ queue: qname=praise qid=1 pqname= pqid=1 ]
+[ queue: qname=praise qid=2 pqname= pqid=2 ]
diff --git a/regress/sbin/pfctl/pfaltq6.ok b/regress/sbin/pfctl/pfaltq6.ok
index 66cc35a7f3e..7ef0787ee0d 100644
--- a/regress/sbin/pfctl/pfaltq6.ok
+++ b/regress/sbin/pfctl/pfaltq6.ok
@@ -3,22 +3,22 @@ queue root_lo0 bandwidth 10Mb priority 0 cbq( wrr root ) {wim, the, minibar, is,
 queue  wim bandwidth 1Mb cbq( default ) 
 [ qid=4294967293 ifname=lo0 ifbandwidth=10Mb ]
 queue  the bandwidth 1Mb 
-[ qid=1 ifname=lo0 ifbandwidth=10Mb ]
-queue  minibar bandwidth 8Mb priority 7 
 [ qid=2 ifname=lo0 ifbandwidth=10Mb ]
-queue  is bandwidth 1Mb 
+queue  minibar bandwidth 8Mb priority 7 
 [ qid=3 ifname=lo0 ifbandwidth=10Mb ]
-queue  empty bandwidth 9Mb 
+queue  is bandwidth 1Mb 
 [ qid=4 ifname=lo0 ifbandwidth=10Mb ]
+queue  empty bandwidth 9Mb 
+[ qid=5 ifname=lo0 ifbandwidth=10Mb ]
 @0 pass in on lo0 proto tcp from any to any port = ssh keep state queue(the, minibar) 
 [ Skip steps: d=end f=end p=end sa=end sp=end da=end dp=3 ]
-[ queue: qname=the qid=1 pqname=minibar pqid=2 ]
+[ queue: qname=the qid=2 pqname=minibar pqid=3 ]
 @1 pass in proto tcp from any to any port = ssh keep state queue(is, empty) 
 [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=3 ]
-[ queue: qname=is qid=3 pqname=empty pqid=4 ]
+[ queue: qname=is qid=4 pqname=empty pqid=5 ]
 @2 pass in proto tcp from any to any port = ssh keep state queue the 
 [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end ]
-[ queue: qname=the qid=1 pqname= pqid=1 ]
+[ queue: qname=the qid=2 pqname= pqid=2 ]
 @3 pass in proto tcp from any to any port = smtp keep state queue wim 
 [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ]
 [ queue: qname=wim qid=4294967293 pqname= pqid=4294967293 ]
diff --git a/regress/sbin/pfctl/pfaltq7.ok b/regress/sbin/pfctl/pfaltq7.ok
index 87c796ef74f..4b80a3ec2e6 100644
--- a/regress/sbin/pfctl/pfaltq7.ok
+++ b/regress/sbin/pfctl/pfaltq7.ok
@@ -1,4 +1,4 @@
 queue eins priority 2 priq( default ) 
-[ qid=1 ifname=lo0 ifbandwidth=10Mb ]
+[ qid=2 ifname=lo0 ifbandwidth=10Mb ]
 queue zwei priority 2 priq( default ) 
-[ qid=2 ifname=tun0 ifbandwidth=33.60Kb ]
+[ qid=3 ifname=tun0 ifbandwidth=33.60Kb ]
diff --git a/regress/sbin/pfctl/pfaltq8.ok b/regress/sbin/pfctl/pfaltq8.ok
index 1320b1f5522..08ac0a14edd 100644
--- a/regress/sbin/pfctl/pfaltq8.ok
+++ b/regress/sbin/pfctl/pfaltq8.ok
@@ -1,16 +1,16 @@
 queue one priq( default ) 
-[ qid=1 ifname=ppp0 ifbandwidth=10Mb ]
+[ qid=2 ifname=ppp0 ifbandwidth=10Mb ]
 queue one priq( default ) 
-[ qid=1 ifname=ppp1 ifbandwidth=10Mb ]
+[ qid=2 ifname=ppp1 ifbandwidth=10Mb ]
 queue one priq( default ) 
-[ qid=1 ifname=tun0 ifbandwidth=10Mb ]
+[ qid=2 ifname=tun0 ifbandwidth=10Mb ]
 queue one priq( default ) 
-[ qid=1 ifname=tun1 ifbandwidth=10Mb ]
+[ qid=2 ifname=tun1 ifbandwidth=10Mb ]
 queue two priority 15 
-[ qid=2 ifname=ppp0 ifbandwidth=10Mb ]
+[ qid=3 ifname=ppp0 ifbandwidth=10Mb ]
 queue two priority 0 
-[ qid=2 ifname=ppp1 ifbandwidth=10Mb ]
+[ qid=3 ifname=ppp1 ifbandwidth=10Mb ]
 queue two priority 0 
-[ qid=2 ifname=tun0 ifbandwidth=10Mb ]
+[ qid=3 ifname=tun0 ifbandwidth=10Mb ]
 queue two priority 0 
-[ qid=2 ifname=tun1 ifbandwidth=10Mb ]
+[ qid=3 ifname=tun1 ifbandwidth=10Mb ]
diff --git a/regress/sbin/pfctl/pfaltq9.ok b/regress/sbin/pfctl/pfaltq9.ok
index 1320b1f5522..08ac0a14edd 100644
--- a/regress/sbin/pfctl/pfaltq9.ok
+++ b/regress/sbin/pfctl/pfaltq9.ok
@@ -1,16 +1,16 @@
 queue one priq( default ) 
-[ qid=1 ifname=ppp0 ifbandwidth=10Mb ]
+[ qid=2 ifname=ppp0 ifbandwidth=10Mb ]
 queue one priq( default ) 
-[ qid=1 ifname=ppp1 ifbandwidth=10Mb ]
+[ qid=2 ifname=ppp1 ifbandwidth=10Mb ]
 queue one priq( default ) 
-[ qid=1 ifname=tun0 ifbandwidth=10Mb ]
+[ qid=2 ifname=tun0 ifbandwidth=10Mb ]
 queue one priq( default ) 
-[ qid=1 ifname=tun1 ifbandwidth=10Mb ]
+[ qid=2 ifname=tun1 ifbandwidth=10Mb ]
 queue two priority 15 
-[ qid=2 ifname=ppp0 ifbandwidth=10Mb ]
+[ qid=3 ifname=ppp0 ifbandwidth=10Mb ]
 queue two priority 0 
-[ qid=2 ifname=ppp1 ifbandwidth=10Mb ]
+[ qid=3 ifname=ppp1 ifbandwidth=10Mb ]
 queue two priority 0 
-[ qid=2 ifname=tun0 ifbandwidth=10Mb ]
+[ qid=3 ifname=tun0 ifbandwidth=10Mb ]
 queue two priority 0 
-[ qid=2 ifname=tun1 ifbandwidth=10Mb ]
+[ qid=3 ifname=tun1 ifbandwidth=10Mb ]