regen

4 files changed, 28 insertions, 28 deletions

diff --git a/regress/sbin/pfctl/pfaltq10.ok b/regress/sbin/pfctl/pfaltq10.ok
index 6bff81dc2d6..b3f62edda4c 100644
--- a/regress/sbin/pfctl/pfaltq10.ok
+++ b/regress/sbin/pfctl/pfaltq10.ok
@@ -1,20 +1,20 @@
-queue root_lo0 bandwidth 10Mb priority 0 hfsc( linkshare 10Mb ) {one, two}
+queue root_lo0 bandwidth 10Mb priority 0 {one, two}
 [ qid=1 ifname=lo0 ifbandwidth=10Mb ]
-queue  one bandwidth 1Mb hfsc( default linkshare 1Mb ) 
+queue  one bandwidth 1Mb hfsc( default ) 
 [ qid=2 ifname=lo0 ifbandwidth=10Mb ]
-queue  two bandwidth 9Mb hfsc( linkshare 9Mb ) {three, four}
+queue  two bandwidth 9Mb {three, four}
 [ qid=3 ifname=lo0 ifbandwidth=10Mb ]
-queue   three bandwidth 4.50Mb hfsc( linkshare 4.50Mb ) 
+queue   three bandwidth 4.50Mb 
 [ qid=4 ifname=lo0 ifbandwidth=10Mb ]
-queue   four bandwidth 3.60Mb hfsc( linkshare 3.60Mb ) 
+queue   four bandwidth 3.60Mb 
 [ qid=5 ifname=lo0 ifbandwidth=10Mb ]
-queue root_tun0 bandwidth 10Mb priority 0 hfsc( linkshare 10Mb ) {one, two}
+queue root_tun0 bandwidth 10Mb priority 0 {one, two}
 [ qid=1 ifname=tun0 ifbandwidth=10Mb ]
-queue  one bandwidth 1Mb hfsc( default linkshare 1Mb ) 
+queue  one bandwidth 1Mb hfsc( default ) 
 [ qid=2 ifname=tun0 ifbandwidth=10Mb ]
-queue  two bandwidth 9Mb hfsc( linkshare 9Mb ) {three, four}
+queue  two bandwidth 9Mb {three, four}
 [ qid=3 ifname=tun0 ifbandwidth=10Mb ]
-queue   three bandwidth 4.50Mb hfsc( linkshare 4.50Mb ) 
+queue   three bandwidth 4.50Mb 
 [ qid=4 ifname=tun0 ifbandwidth=10Mb ]
-queue   four bandwidth 3.60Mb hfsc( linkshare 3.60Mb ) 
+queue   four bandwidth 3.60Mb 
 [ qid=5 ifname=tun0 ifbandwidth=10Mb ]
diff --git a/regress/sbin/pfctl/pfaltq11.ok b/regress/sbin/pfctl/pfaltq11.ok
index 8fc43486c65..a0bf0d4c986 100644
--- a/regress/sbin/pfctl/pfaltq11.ok
+++ b/regress/sbin/pfctl/pfaltq11.ok
@@ -1,28 +1,28 @@
-queue root_lo0 bandwidth 10Mb priority 0 hfsc( linkshare 10Mb ) {eins, zwei, drei}
+queue root_lo0 bandwidth 10Mb priority 0 {eins, zwei, drei}
 [ qid=1 ifname=lo0 ifbandwidth=10Mb ]
-queue  eins bandwidth 1Mb hfsc( default linkshare 1Mb ) 
+queue  eins bandwidth 1Mb hfsc( default ) 
 [ qid=2 ifname=lo0 ifbandwidth=10Mb ]
-queue  zwei bandwidth 8Mb hfsc( linkshare 8Mb ) {sub2, sub3}
+queue  zwei bandwidth 8Mb {sub2, sub3}
 [ qid=3 ifname=lo0 ifbandwidth=10Mb ]
-queue   sub2 bandwidth 4Mb hfsc( linkshare 4Mb ) 
+queue   sub2 bandwidth 4Mb 
 [ qid=4 ifname=lo0 ifbandwidth=10Mb ]
-queue   sub3 bandwidth 4Mb hfsc( linkshare 4Mb ) 
+queue   sub3 bandwidth 4Mb 
 [ qid=5 ifname=lo0 ifbandwidth=10Mb ]
-queue  drei bandwidth 1Mb hfsc( linkshare 1Mb ) {subseven}
+queue  drei bandwidth 1Mb {subseven}
 [ qid=6 ifname=lo0 ifbandwidth=10Mb ]
-queue   subseven bandwidth 900Kb hfsc( linkshare 900Kb ) 
+queue   subseven bandwidth 900Kb 
 [ qid=9 ifname=lo0 ifbandwidth=10Mb ]
-queue root_tun0 bandwidth 33.60Kb priority 0 hfsc( linkshare 33.60Kb ) {zwei, vier, fuenf}
+queue root_tun0 bandwidth 33.60Kb priority 0 {zwei, vier, fuenf}
 [ qid=1 ifname=tun0 ifbandwidth=33.60Kb ]
-queue  zwei bandwidth 26.88Kb hfsc( linkshare 26.88Kb ) {sub2, sub3}
+queue  zwei bandwidth 26.88Kb {sub2, sub3}
 [ qid=3 ifname=tun0 ifbandwidth=33.60Kb ]
-queue   sub2 bandwidth 13.40Kb hfsc( linkshare 13.40Kb ) 
+queue   sub2 bandwidth 13.40Kb 
 [ qid=4 ifname=tun0 ifbandwidth=33.60Kb ]
-queue   sub3 bandwidth 13.40Kb hfsc( linkshare 13.40Kb ) 
+queue   sub3 bandwidth 13.40Kb 
 [ qid=5 ifname=tun0 ifbandwidth=33.60Kb ]
-queue  vier bandwidth 3.36Kb hfsc( default linkshare 3.36Kb ) 
+queue  vier bandwidth 3.36Kb hfsc( default ) 
 [ qid=7 ifname=tun0 ifbandwidth=33.60Kb ]
-queue  fuenf bandwidth 16.80Kb hfsc( linkshare 16.80Kb ) {subseven}
+queue  fuenf bandwidth 16.80Kb {subseven}
 [ qid=8 ifname=tun0 ifbandwidth=33.60Kb ]
-queue   subseven bandwidth 15.12Kb hfsc( linkshare 15.12Kb ) 
+queue   subseven bandwidth 15.12Kb 
 [ qid=9 ifname=tun0 ifbandwidth=33.60Kb ]
diff --git a/regress/sbin/pfctl/pfaltq12.ok b/regress/sbin/pfctl/pfaltq12.ok
index 7bc8466d080..98a4bf2dbb8 100644
--- a/regress/sbin/pfctl/pfaltq12.ok
+++ b/regress/sbin/pfctl/pfaltq12.ok
@@ -1,4 +1,4 @@
-queue root_lo0 bandwidth 10Mb priority 0 hfsc( linkshare 10Mb ) {eins, zwei, drei}
+queue root_lo0 bandwidth 10Mb priority 0 {eins, zwei, drei}
 [ qid=1 ifname=lo0 ifbandwidth=10Mb ]
 queue  eins bandwidth 1Mb hfsc( default linkshare(2Mb 20ms 500Kb) ) 
 [ qid=2 ifname=lo0 ifbandwidth=10Mb ]
diff --git a/regress/sbin/pfctl/pfaltq13.ok b/regress/sbin/pfctl/pfaltq13.ok
index 7e4ec44cf41..b734db04283 100644
--- a/regress/sbin/pfctl/pfaltq13.ok
+++ b/regress/sbin/pfctl/pfaltq13.ok
@@ -1,8 +1,8 @@
-queue root_lo0 bandwidth 10Mb priority 0 hfsc( linkshare 10Mb ) {eins, zwei, drei}
+queue root_lo0 bandwidth 10Mb priority 0 {eins, zwei, drei}
 [ qid=1 ifname=lo0 ifbandwidth=10Mb ]
-queue  eins bandwidth 1Mb hfsc( default realtime(2Mb 20ms 500Kb) linkshare 1Mb ) 
+queue  eins bandwidth 1Mb hfsc( default realtime(2Mb 20ms 500Kb) ) 
 [ qid=2 ifname=lo0 ifbandwidth=10Mb ]
 queue  zwei bandwidth 4Mb hfsc( realtime 5Mb linkshare 3.50Mb ) 
 [ qid=3 ifname=lo0 ifbandwidth=10Mb ]
-queue  drei bandwidth 5Mb hfsc( realtime(6Mb 20ms 4Mb) linkshare 5Mb upperlimit(6.50Mb 10ms 4.50Mb) ) 
+queue  drei bandwidth 5Mb hfsc( realtime(6Mb 20ms 4Mb) upperlimit(6.50Mb 10ms 4.50Mb) ) 
 [ qid=4 ifname=lo0 ifbandwidth=10Mb ]