regen; qid change.

12 files changed, 92 insertions, 92 deletions

diff --git a/regress/sbin/pfctl/pfaltq1.ok b/regress/sbin/pfctl/pfaltq1.ok
index 384eb751c47..7971fee5ab6 100644
--- a/regress/sbin/pfctl/pfaltq1.ok
+++ b/regress/sbin/pfctl/pfaltq1.ok
@@ -1,8 +1,8 @@
 queue one priq( default ) 
-  [ qid=2 ifname=lo0 ifbandwidth=10Mb ]
+  [ qid=1 ifname=lo0 ifbandwidth=10Mb ]
 queue one priq( default ) 
-  [ qid=2 ifname=tun1000000 ifbandwidth=10Mb ]
+  [ qid=1 ifname=tun1000000 ifbandwidth=10Mb ]
 queue two priority 15 
-  [ qid=3 ifname=lo0 ifbandwidth=10Mb ]
+  [ qid=2 ifname=lo0 ifbandwidth=10Mb ]
 queue two priority 15 
-  [ qid=3 ifname=tun1000000 ifbandwidth=10Mb ]
+  [ qid=2 ifname=tun1000000 ifbandwidth=10Mb ]
diff --git a/regress/sbin/pfctl/pfaltq10.ok b/regress/sbin/pfctl/pfaltq10.ok
index a85150de335..50c2dc57538 100644
--- a/regress/sbin/pfctl/pfaltq10.ok
+++ b/regress/sbin/pfctl/pfaltq10.ok
@@ -1,20 +1,20 @@
 queue root_lo0 bandwidth 10Mb priority 0 {one, two}
   [ qid=1 ifname=lo0 ifbandwidth=10Mb ]
 queue  one bandwidth 1Mb hfsc( default ) 
-  [ qid=2 ifname=lo0 ifbandwidth=10Mb ]
-queue  two bandwidth 9Mb {three, four}
   [ qid=3 ifname=lo0 ifbandwidth=10Mb ]
-queue   three bandwidth 4.50Mb 
+queue  two bandwidth 9Mb {three, four}
   [ qid=4 ifname=lo0 ifbandwidth=10Mb ]
-queue   four bandwidth 3.60Mb 
+queue   three bandwidth 4.50Mb 
   [ qid=5 ifname=lo0 ifbandwidth=10Mb ]
+queue   four bandwidth 3.60Mb 
+  [ qid=6 ifname=lo0 ifbandwidth=10Mb ]
 queue root_tun1000000 bandwidth 10Mb priority 0 {one, two}
-  [ qid=1 ifname=tun1000000 ifbandwidth=10Mb ]
-queue  one bandwidth 1Mb hfsc( default ) 
   [ qid=2 ifname=tun1000000 ifbandwidth=10Mb ]
-queue  two bandwidth 9Mb {three, four}
+queue  one bandwidth 1Mb hfsc( default ) 
   [ qid=3 ifname=tun1000000 ifbandwidth=10Mb ]
-queue   three bandwidth 4.50Mb 
+queue  two bandwidth 9Mb {three, four}
   [ qid=4 ifname=tun1000000 ifbandwidth=10Mb ]
-queue   four bandwidth 3.60Mb 
+queue   three bandwidth 4.50Mb 
   [ qid=5 ifname=tun1000000 ifbandwidth=10Mb ]
+queue   four bandwidth 3.60Mb 
+  [ qid=6 ifname=tun1000000 ifbandwidth=10Mb ]
diff --git a/regress/sbin/pfctl/pfaltq11.ok b/regress/sbin/pfctl/pfaltq11.ok
index b8a4df85686..a94213b0910 100644
--- a/regress/sbin/pfctl/pfaltq11.ok
+++ b/regress/sbin/pfctl/pfaltq11.ok
@@ -1,28 +1,28 @@
 queue root_lo0 bandwidth 10Mb priority 0 {eins, zwei, drei}
   [ qid=1 ifname=lo0 ifbandwidth=10Mb ]
 queue  eins bandwidth 1Mb hfsc( default ) 
-  [ qid=2 ifname=lo0 ifbandwidth=10Mb ]
-queue  zwei bandwidth 8Mb {sub2, sub3}
   [ qid=3 ifname=lo0 ifbandwidth=10Mb ]
-queue   sub2 bandwidth 4Mb 
+queue  zwei bandwidth 8Mb {sub2, sub3}
   [ qid=4 ifname=lo0 ifbandwidth=10Mb ]
-queue   sub3 bandwidth 4Mb 
+queue   sub2 bandwidth 4Mb 
   [ qid=5 ifname=lo0 ifbandwidth=10Mb ]
-queue  drei bandwidth 1Mb {subseven}
+queue   sub3 bandwidth 4Mb 
   [ qid=6 ifname=lo0 ifbandwidth=10Mb ]
+queue  drei bandwidth 1Mb {subseven}
+  [ qid=7 ifname=lo0 ifbandwidth=10Mb ]
 queue   subseven bandwidth 900Kb 
-  [ qid=9 ifname=lo0 ifbandwidth=10Mb ]
+  [ qid=10 ifname=lo0 ifbandwidth=10Mb ]
 queue root_tun1000000 bandwidth 33.60Kb priority 0 {zwei, vier, fuenf}
-  [ qid=1 ifname=tun1000000 ifbandwidth=33.60Kb ]
+  [ qid=2 ifname=tun1000000 ifbandwidth=33.60Kb ]
 queue  zwei bandwidth 26.88Kb {sub2, sub3}
-  [ qid=3 ifname=tun1000000 ifbandwidth=33.60Kb ]
-queue   sub2 bandwidth 13.40Kb 
   [ qid=4 ifname=tun1000000 ifbandwidth=33.60Kb ]
-queue   sub3 bandwidth 13.40Kb 
+queue   sub2 bandwidth 13.40Kb 
   [ qid=5 ifname=tun1000000 ifbandwidth=33.60Kb ]
+queue   sub3 bandwidth 13.40Kb 
+  [ qid=6 ifname=tun1000000 ifbandwidth=33.60Kb ]
 queue  vier bandwidth 3.36Kb hfsc( default ) 
-  [ qid=7 ifname=tun1000000 ifbandwidth=33.60Kb ]
-queue  fuenf bandwidth 16.80Kb {subseven}
   [ qid=8 ifname=tun1000000 ifbandwidth=33.60Kb ]
-queue   subseven bandwidth 15.12Kb 
+queue  fuenf bandwidth 16.80Kb {subseven}
   [ qid=9 ifname=tun1000000 ifbandwidth=33.60Kb ]
+queue   subseven bandwidth 15.12Kb 
+  [ qid=10 ifname=tun1000000 ifbandwidth=33.60Kb ]
diff --git a/regress/sbin/pfctl/pfaltq2.ok b/regress/sbin/pfctl/pfaltq2.ok
index a906cee8d41..ccdcbf5e2bf 100644
--- a/regress/sbin/pfctl/pfaltq2.ok
+++ b/regress/sbin/pfctl/pfaltq2.ok
@@ -1,20 +1,20 @@
 queue root_lo0 bandwidth 10Mb priority 0 cbq( wrr root ) {one, two}
-  [ qid=4294967294 ifname=lo0 ifbandwidth=10Mb ]
+  [ qid=1 ifname=lo0 ifbandwidth=10Mb ]
 queue  one bandwidth 1Mb cbq( default ) 
-  [ qid=4294967293 ifname=lo0 ifbandwidth=10Mb ]
+  [ qid=3 ifname=lo0 ifbandwidth=10Mb ]
 queue  two bandwidth 9Mb {three, four}
-  [ qid=2 ifname=lo0 ifbandwidth=10Mb ]
+  [ qid=4 ifname=lo0 ifbandwidth=10Mb ]
 queue   three bandwidth 4.50Mb 
-  [ qid=3 ifname=lo0 ifbandwidth=10Mb ]
+  [ qid=5 ifname=lo0 ifbandwidth=10Mb ]
 queue   four bandwidth 3.60Mb 
-  [ qid=4 ifname=lo0 ifbandwidth=10Mb ]
+  [ qid=6 ifname=lo0 ifbandwidth=10Mb ]
 queue root_tun1000000 bandwidth 10Mb priority 0 cbq( wrr root ) {one, two}
-  [ qid=4294967294 ifname=tun1000000 ifbandwidth=10Mb ]
+  [ qid=2 ifname=tun1000000 ifbandwidth=10Mb ]
 queue  one bandwidth 1Mb cbq( default ) 
-  [ qid=4294967293 ifname=tun1000000 ifbandwidth=10Mb ]
+  [ qid=3 ifname=tun1000000 ifbandwidth=10Mb ]
 queue  two bandwidth 9Mb {three, four}
-  [ qid=2 ifname=tun1000000 ifbandwidth=10Mb ]
+  [ qid=4 ifname=tun1000000 ifbandwidth=10Mb ]
 queue   three bandwidth 4.50Mb 
-  [ qid=3 ifname=tun1000000 ifbandwidth=10Mb ]
+  [ qid=5 ifname=tun1000000 ifbandwidth=10Mb ]
 queue   four bandwidth 3.60Mb 
-  [ qid=4 ifname=tun1000000 ifbandwidth=10Mb ]
+  [ qid=6 ifname=tun1000000 ifbandwidth=10Mb ]
diff --git a/regress/sbin/pfctl/pfaltq3.ok b/regress/sbin/pfctl/pfaltq3.ok
index cc951076ee4..c308f31f342 100644
--- a/regress/sbin/pfctl/pfaltq3.ok
+++ b/regress/sbin/pfctl/pfaltq3.ok
@@ -1,28 +1,28 @@
 queue root_lo0 bandwidth 10Mb priority 0 cbq( wrr root ) {eins, zwei, drei}
-  [ qid=4294967294 ifname=lo0 ifbandwidth=10Mb ]
+  [ qid=1 ifname=lo0 ifbandwidth=10Mb ]
 queue  eins bandwidth 1Mb cbq( default ) 
-  [ qid=4294967293 ifname=lo0 ifbandwidth=10Mb ]
+  [ qid=3 ifname=lo0 ifbandwidth=10Mb ]
 queue  zwei bandwidth 8Mb {sub2, sub3}
-  [ qid=2 ifname=lo0 ifbandwidth=10Mb ]
+  [ qid=4 ifname=lo0 ifbandwidth=10Mb ]
 queue   sub2 bandwidth 4Mb 
-  [ qid=3 ifname=lo0 ifbandwidth=10Mb ]
+  [ qid=5 ifname=lo0 ifbandwidth=10Mb ]
 queue   sub3 bandwidth 4Mb 
-  [ qid=4 ifname=lo0 ifbandwidth=10Mb ]
+  [ qid=6 ifname=lo0 ifbandwidth=10Mb ]
 queue  drei bandwidth 1Mb {subseven}
-  [ qid=5 ifname=lo0 ifbandwidth=10Mb ]
-queue   subseven bandwidth 900Kb 
   [ qid=7 ifname=lo0 ifbandwidth=10Mb ]
+queue   subseven bandwidth 900Kb 
+  [ qid=10 ifname=lo0 ifbandwidth=10Mb ]
 queue root_tun1000000 bandwidth 33.60Kb priority 0 cbq( wrr root ) {zwei, vier, fuenf}
-  [ qid=4294967294 ifname=tun1000000 ifbandwidth=33.60Kb ]
-queue  zwei bandwidth 26.88Kb {sub2, sub3}
   [ qid=2 ifname=tun1000000 ifbandwidth=33.60Kb ]
+queue  zwei bandwidth 26.88Kb {sub2, sub3}
+  [ qid=4 ifname=tun1000000 ifbandwidth=33.60Kb ]
 queue   sub2 bandwidth 13.40Kb 
-  [ qid=3 ifname=tun1000000 ifbandwidth=33.60Kb ]
+  [ qid=5 ifname=tun1000000 ifbandwidth=33.60Kb ]
 queue   sub3 bandwidth 13.40Kb 
-  [ qid=4 ifname=tun1000000 ifbandwidth=33.60Kb ]
+  [ qid=6 ifname=tun1000000 ifbandwidth=33.60Kb ]
 queue  vier bandwidth 16.80Kb cbq( default ) 
-  [ qid=4294967293 ifname=tun1000000 ifbandwidth=33.60Kb ]
+  [ qid=8 ifname=tun1000000 ifbandwidth=33.60Kb ]
 queue  fuenf bandwidth 16.80Kb {subseven}
-  [ qid=6 ifname=tun1000000 ifbandwidth=33.60Kb ]
+  [ qid=9 ifname=tun1000000 ifbandwidth=33.60Kb ]
 queue   subseven bandwidth 15.12Kb 
-  [ qid=7 ifname=tun1000000 ifbandwidth=33.60Kb ]
+  [ qid=10 ifname=tun1000000 ifbandwidth=33.60Kb ]
diff --git a/regress/sbin/pfctl/pfaltq4.ok b/regress/sbin/pfctl/pfaltq4.ok
index 6583463a340..ae9b27e915e 100644
--- a/regress/sbin/pfctl/pfaltq4.ok
+++ b/regress/sbin/pfctl/pfaltq4.ok
@@ -1,12 +1,12 @@
 queue root_lo0 bandwidth 10Mb priority 0 cbq( wrr root ) {bloody, germans}
-  [ qid=4294967294 ifname=lo0 ifbandwidth=10Mb ]
+  [ qid=1 ifname=lo0 ifbandwidth=10Mb ]
 queue  bloody bandwidth 5Mb cbq( default ) 
-  [ qid=4294967293 ifname=lo0 ifbandwidth=10Mb ]
+  [ qid=3 ifname=lo0 ifbandwidth=10Mb ]
 queue  germans bandwidth 5Mb 
-  [ qid=2 ifname=lo0 ifbandwidth=10Mb ]
+  [ qid=4 ifname=lo0 ifbandwidth=10Mb ]
 queue root_tun1000000 bandwidth 10Mb priority 0 cbq( wrr root ) {bloody, toads}
-  [ qid=4294967294 ifname=tun1000000 ifbandwidth=10Mb ]
+  [ qid=2 ifname=tun1000000 ifbandwidth=10Mb ]
 queue  bloody bandwidth 5Mb cbq( default ) 
-  [ qid=4294967293 ifname=tun1000000 ifbandwidth=10Mb ]
-queue  toads bandwidth 5Mb 
   [ qid=3 ifname=tun1000000 ifbandwidth=10Mb ]
+queue  toads bandwidth 5Mb 
+  [ qid=5 ifname=tun1000000 ifbandwidth=10Mb ]
diff --git a/regress/sbin/pfctl/pfaltq5.ok b/regress/sbin/pfctl/pfaltq5.ok
index 74719b0b03b..052756c3e9e 100644
--- a/regress/sbin/pfctl/pfaltq5.ok
+++ b/regress/sbin/pfctl/pfaltq5.ok
@@ -1,18 +1,18 @@
 queue praise priq( default ) 
-  [ qid=2 ifname=lo0 ifbandwidth=10Mb ]
+  [ qid=1 ifname=lo0 ifbandwidth=10Mb ]
 queue wim priority 15 
-  [ qid=3 ifname=lo0 ifbandwidth=10Mb ]
+  [ qid=2 ifname=lo0 ifbandwidth=10Mb ]
 queue hi priority 7 
-  [ qid=4 ifname=lo0 ifbandwidth=10Mb ]
+  [ qid=3 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=4 pqname=wim pqid=3 ]
+  [ queue: qname=hi qid=3 pqname=wim pqid=2 ]
 @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=4 pqname=wim pqid=3 ]
+  [ queue: qname=hi qid=3 pqname=wim pqid=2 ]
 @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=3 pqname= pqid=3 ]
+  [ queue: qname=wim qid=2 pqname= pqid=2 ]
 @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=2 pqname= pqid=2 ]
+  [ queue: qname=praise qid=1 pqname= pqid=1 ]
diff --git a/regress/sbin/pfctl/pfaltq6.ok b/regress/sbin/pfctl/pfaltq6.ok
index 84d482b6898..d59f464cc24 100644
--- a/regress/sbin/pfctl/pfaltq6.ok
+++ b/regress/sbin/pfctl/pfaltq6.ok
@@ -1,24 +1,24 @@
 queue root_lo0 bandwidth 10Mb priority 0 cbq( wrr root ) {wim, the, minibar, is, empty}
-  [ qid=4294967294 ifname=lo0 ifbandwidth=10Mb ]
+  [ qid=1 ifname=lo0 ifbandwidth=10Mb ]
 queue  wim bandwidth 1Mb cbq( default ) 
-  [ qid=4294967293 ifname=lo0 ifbandwidth=10Mb ]
-queue  the bandwidth 1Mb 
   [ qid=2 ifname=lo0 ifbandwidth=10Mb ]
-queue  minibar bandwidth 8Mb priority 7 
+queue  the bandwidth 1Mb 
   [ qid=3 ifname=lo0 ifbandwidth=10Mb ]
-queue  is bandwidth 1Mb 
+queue  minibar bandwidth 8Mb priority 7 
   [ qid=4 ifname=lo0 ifbandwidth=10Mb ]
-queue  empty bandwidth 9Mb 
+queue  is bandwidth 1Mb 
   [ qid=5 ifname=lo0 ifbandwidth=10Mb ]
+queue  empty bandwidth 9Mb 
+  [ qid=6 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=2 pqname=minibar pqid=3 ]
+  [ queue: qname=the qid=3 pqname=minibar pqid=4 ]
 @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=4 pqname=empty pqid=5 ]
+  [ queue: qname=is qid=5 pqname=empty pqid=6 ]
 @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=2 pqname= pqid=2 ]
+  [ queue: qname=the qid=3 pqname= pqid=3 ]
 @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 ]
+  [ queue: qname=wim qid=2 pqname= pqid=2 ]
diff --git a/regress/sbin/pfctl/pfaltq7.ok b/regress/sbin/pfctl/pfaltq7.ok
index fe250e95966..110e2a1cb2b 100644
--- a/regress/sbin/pfctl/pfaltq7.ok
+++ b/regress/sbin/pfctl/pfaltq7.ok
@@ -1,4 +1,4 @@
 queue eins priority 2 priq( default ) 
-  [ qid=2 ifname=lo0 ifbandwidth=10Mb ]
+  [ qid=1 ifname=lo0 ifbandwidth=10Mb ]
 queue zwei priority 2 priq( default ) 
-  [ qid=3 ifname=tun1000000 ifbandwidth=33.60Kb ]
+  [ qid=2 ifname=tun1000000 ifbandwidth=33.60Kb ]
diff --git a/regress/sbin/pfctl/pfaltq8.ok b/regress/sbin/pfctl/pfaltq8.ok
index d1159fa3323..67f78cd6a63 100644
--- a/regress/sbin/pfctl/pfaltq8.ok
+++ b/regress/sbin/pfctl/pfaltq8.ok
@@ -1,16 +1,16 @@
 queue one priq( default ) 
-  [ qid=2 ifname=ppp0 ifbandwidth=10Mb ]
+  [ qid=1 ifname=ppp0 ifbandwidth=10Mb ]
 queue one priq( default ) 
-  [ qid=2 ifname=ppp1 ifbandwidth=10Mb ]
+  [ qid=1 ifname=ppp1 ifbandwidth=10Mb ]
 queue one priq( default ) 
-  [ qid=2 ifname=tun1000000 ifbandwidth=10Mb ]
+  [ qid=1 ifname=tun1000000 ifbandwidth=10Mb ]
 queue one priq( default ) 
-  [ qid=2 ifname=tun1000001 ifbandwidth=10Mb ]
+  [ qid=1 ifname=tun1000001 ifbandwidth=10Mb ]
 queue two priority 15 
-  [ qid=3 ifname=ppp0 ifbandwidth=10Mb ]
+  [ qid=2 ifname=ppp0 ifbandwidth=10Mb ]
 queue two priority 0 
-  [ qid=3 ifname=ppp1 ifbandwidth=10Mb ]
+  [ qid=2 ifname=ppp1 ifbandwidth=10Mb ]
 queue two priority 0 
-  [ qid=3 ifname=tun1000000 ifbandwidth=10Mb ]
+  [ qid=2 ifname=tun1000000 ifbandwidth=10Mb ]
 queue two priority 0 
-  [ qid=3 ifname=tun1000001 ifbandwidth=10Mb ]
+  [ qid=2 ifname=tun1000001 ifbandwidth=10Mb ]
diff --git a/regress/sbin/pfctl/pfaltq9.ok b/regress/sbin/pfctl/pfaltq9.ok
index d1159fa3323..67f78cd6a63 100644
--- a/regress/sbin/pfctl/pfaltq9.ok
+++ b/regress/sbin/pfctl/pfaltq9.ok
@@ -1,16 +1,16 @@
 queue one priq( default ) 
-  [ qid=2 ifname=ppp0 ifbandwidth=10Mb ]
+  [ qid=1 ifname=ppp0 ifbandwidth=10Mb ]
 queue one priq( default ) 
-  [ qid=2 ifname=ppp1 ifbandwidth=10Mb ]
+  [ qid=1 ifname=ppp1 ifbandwidth=10Mb ]
 queue one priq( default ) 
-  [ qid=2 ifname=tun1000000 ifbandwidth=10Mb ]
+  [ qid=1 ifname=tun1000000 ifbandwidth=10Mb ]
 queue one priq( default ) 
-  [ qid=2 ifname=tun1000001 ifbandwidth=10Mb ]
+  [ qid=1 ifname=tun1000001 ifbandwidth=10Mb ]
 queue two priority 15 
-  [ qid=3 ifname=ppp0 ifbandwidth=10Mb ]
+  [ qid=2 ifname=ppp0 ifbandwidth=10Mb ]
 queue two priority 0 
-  [ qid=3 ifname=ppp1 ifbandwidth=10Mb ]
+  [ qid=2 ifname=ppp1 ifbandwidth=10Mb ]
 queue two priority 0 
-  [ qid=3 ifname=tun1000000 ifbandwidth=10Mb ]
+  [ qid=2 ifname=tun1000000 ifbandwidth=10Mb ]
 queue two priority 0 
-  [ qid=3 ifname=tun1000001 ifbandwidth=10Mb ]
+  [ qid=2 ifname=tun1000001 ifbandwidth=10Mb ]
diff --git a/regress/sbin/pfctl/pfsetup3.ok b/regress/sbin/pfctl/pfsetup3.ok
index 984ba0d8f6f..ef3cf0cc47c 100644
--- a/regress/sbin/pfctl/pfsetup3.ok
+++ b/regress/sbin/pfctl/pfsetup3.ok
@@ -1,2 +1,2 @@
-altq on lo1000010 cbq bandwidth 10Mb tbrsize 32000 queue { openbsd rocks }
+altq on lo1000010 cbq bandwidth 10Mb tbrsize 65535 queue { openbsd rocks }
 queue openbsd cbq( default )