regen after pfctl changes

9 files changed, 21 insertions, 21 deletions

diff --git a/regress/sbin/pfctl/pf33.ok b/regress/sbin/pfctl/pf33.ok
index c2ac3af6fcf..32bb4e1fb7c 100644
--- a/regress/sbin/pfctl/pf33.ok
+++ b/regress/sbin/pfctl/pf33.ok
@@ -1,10 +1,10 @@
 ext_if = "lo0"
 altq on lo0 cbq bandwidth 10.00Mb tbrsize 1824 queue { deflt http ssh mail rsets }
-queue deflt bandwidth 1.00Mb priority 0 cbq( red ecn default ) 
+queue deflt bandwidth 10% priority 0 cbq( red ecn default ) 
 queue http bandwidth 1.50Mb priority 3 { http_vhosts http_cust1 }
-queue http_vhosts bandwidth 600.00Kb cbq( red borrow ) 
+queue http_vhosts bandwidth 40% cbq( red borrow ) 
 queue http_cust1 bandwidth 500.00Kb 
-queue mail bandwidth 1.00Mb 
+queue mail bandwidth 10% 
 queue ssh bandwidth 200.00Kb priority 7 cbq( borrow ) 
 queue rsets bandwidth 150.00Kb priority 0 cbq( red ) 
 block return in on lo0 inet all queue rsets 
diff --git a/regress/sbin/pfctl/pf35.ok b/regress/sbin/pfctl/pf35.ok
index ba2790a1c06..bdf8144b307 100644
--- a/regress/sbin/pfctl/pf35.ok
+++ b/regress/sbin/pfctl/pf35.ok
@@ -2,14 +2,14 @@ intf = "lo0"
 developerhosts = "10.0.0.0/24"
 employeehosts = "10.0.1.0/24"
 altq on lo0 cbq( red ecn ) bandwidth 10.00Mb qlimit 100 tbrsize 5000 queue { std http mail ssh }
-queue std bandwidth 1.00Mb qlimit 1 cbq( default ) 
-queue http bandwidth 6.00Mb priority 2 cbq( red borrow ) { employees developers }
-queue developers bandwidth 6.00Mb 
-queue employees bandwidth 600.00Kb 
-queue mail bandwidth 1.00Mb priority 0 cbq( red ecn borrow ) 
-queue ssh bandwidth 2.00Mb cbq( borrow ) { ssh_interactive ssh_bulk }
-queue ssh_interactive bandwidth 2.00Mb priority 7 
-queue ssh_bulk bandwidth 2.00Mb priority 0 qlimit 60 
+queue std bandwidth 10% qlimit 1 cbq( default ) 
+queue http bandwidth 60% priority 2 cbq( red borrow ) { employees developers }
+queue developers 
+queue employees bandwidth 10% 
+queue mail bandwidth 10% priority 0 cbq( red ecn borrow ) 
+queue ssh bandwidth 20% cbq( borrow ) { ssh_interactive ssh_bulk }
+queue ssh_interactive priority 7 
+queue ssh_bulk priority 0 qlimit 60 
 block return out on lo0 inet all queue std 
 pass out on lo0 inet proto tcp from 10.0.0.0/24 to any port = www keep state queue developers 
 pass out on lo0 inet proto tcp from 10.0.1.0/24 to any port = www keep state queue employees 
diff --git a/regress/sbin/pfctl/pf37.ok b/regress/sbin/pfctl/pf37.ok
index a8684e3a2f0..af650d9542c 100644
--- a/regress/sbin/pfctl/pf37.ok
+++ b/regress/sbin/pfctl/pf37.ok
@@ -1,3 +1,3 @@
 altq on lo0 cbq bandwidth 10.00Mb tbrsize 1824 queue { std }
 altq on lo1 cbq bandwidth 10.00Mb tbrsize 1824 queue { std }
-queue std bandwidth 10.00Mb cbq( default ) 
+queue std cbq( default ) 
diff --git a/regress/sbin/pfctl/pf42.ok b/regress/sbin/pfctl/pf42.ok
index 19ad8a06408..bbf97038409 100644
--- a/regress/sbin/pfctl/pf42.ok
+++ b/regress/sbin/pfctl/pf42.ok
@@ -1,5 +1,5 @@
 ext_if = "lo0"
 altq on lo0 cbq bandwidth 10.00Mb tbrsize 1824 queue { deflt http ssh mail rsets }
-queue deflt bandwidth 1.00Mb priority 0 cbq( red ecn default ) 
+queue deflt bandwidth 10% priority 0 cbq( red ecn default ) 
 queue http bandwidth 1.50Mb priority 3 { http_vhosts http_cust1 }
-queue http_vhosts bandwidth 600.00Kb cbq( red borrow ) 
+queue http_vhosts bandwidth 40% cbq( red borrow ) 
diff --git a/regress/sbin/pfctl/pf43.ok b/regress/sbin/pfctl/pf43.ok
index 5dc85d60e98..97954d8b0b8 100644
--- a/regress/sbin/pfctl/pf43.ok
+++ b/regress/sbin/pfctl/pf43.ok
@@ -1,6 +1,6 @@
 altq on lo0 cbq bandwidth 100.00Mb tbrsize 3648 queue { bulk prio }
-queue bulk bandwidth 100.00Mb cbq( default ) 
-queue prio bandwidth 100.00Mb priority 7 
+queue bulk cbq( default ) 
+queue prio priority 7 
 pass in on lo0 inet proto tcp from any to 127.0.0.1 port = ssh queue(bulk, prio) 
 pass in on lo0 inet proto tcp from any to 127.0.0.1 port = ssh queue bulk 
 pass in on lo0 inet proto tcp from any to 127.0.0.1 port = ssh queue(bulk, prio) 
diff --git a/regress/sbin/pfctl/pf51.ok b/regress/sbin/pfctl/pf51.ok
index 091348410b6..89f12077218 100644
--- a/regress/sbin/pfctl/pf51.ok
+++ b/regress/sbin/pfctl/pf51.ok
@@ -3,4 +3,4 @@ set require-order no
 nat on lo0 inet all -> 127.0.0.1
 altq on lo0 cbq bandwidth 10.00Mb tbrsize 1824 queue { toad frog }
 queue toad bandwidth 1.00Mb 
-queue frog bandwidth 9.00Mb cbq( default ) 
+queue frog bandwidth 90% cbq( default ) 
diff --git a/regress/sbin/pfctl/pfail18.ok b/regress/sbin/pfctl/pfail18.ok
index c5e2cff5a00..d66d38d41ce 100644
--- a/regress/sbin/pfctl/pfail18.ok
+++ b/regress/sbin/pfctl/pfail18.ok
@@ -1,5 +1,5 @@
 stdin:6: queue has no parent
 pfctl: Syntax error in file: pf rules not loaded
 altq on lo0 cbq bandwidth 10.00Mb tbrsize 1824 queue { frenchs eat frogs }
-queue frenchs bandwidth 3.00Mb cbq( default ) 
-queue eat bandwidth 3.00Mb 
+queue frenchs bandwidth 30% cbq( default ) 
+queue eat bandwidth 30% 
diff --git a/regress/sbin/pfctl/pfsetup2.ok b/regress/sbin/pfctl/pfsetup2.ok
index 516f04a6a05..abb7c72073b 100644
--- a/regress/sbin/pfctl/pfsetup2.ok
+++ b/regress/sbin/pfctl/pfsetup2.ok
@@ -1,2 +1,2 @@
 altq on lo1 cbq bandwidth 10.00Mb tbrsize 6000 queue { openbsd rocks }
-queue openbsd bandwidth 10.00Mb cbq( default ) 
+queue openbsd cbq( default ) 
diff --git a/regress/sbin/pfctl/pfsetup3.ok b/regress/sbin/pfctl/pfsetup3.ok
index 1fcb8fc7ba4..7c772cd143e 100644
--- a/regress/sbin/pfctl/pfsetup3.ok
+++ b/regress/sbin/pfctl/pfsetup3.ok
@@ -1,2 +1,2 @@
 altq on lo1 cbq bandwidth 10.00Mb tbrsize 32000 queue { openbsd rocks }
-queue openbsd bandwidth 10.00Mb cbq( default ) 
+queue openbsd cbq( default )