more altq bandwidth tweaks for "make pfaltq".

10 files changed, 37 insertions, 37 deletions

diff --git a/regress/sbin/pfctl/pfaltq11.in b/regress/sbin/pfctl/pfaltq11.in
index fc3de4c74da..0e1551921e0 100644
--- a/regress/sbin/pfctl/pfaltq11.in
+++ b/regress/sbin/pfctl/pfaltq11.in
@@ -10,6 +10,6 @@ queue  sub2 bandwidth 50%
 queue  sub3 bandwidth 50%
 queue drei bandwidth 10% subseven
 queue vier bandwidth 10% hfsc(default)
-queue fuenf bandwidth 50% subseven
+queue fuenf bandwidth 5% subseven
 queue  subseven bandwidth 90%
 
diff --git a/regress/sbin/pfctl/pfaltq11.ok b/regress/sbin/pfctl/pfaltq11.ok
index a94213b0910..0a275b56ce2 100644
--- a/regress/sbin/pfctl/pfaltq11.ok
+++ b/regress/sbin/pfctl/pfaltq11.ok
@@ -22,7 +22,7 @@ queue   sub3 bandwidth 13.40Kb
   [ qid=6 ifname=tun1000000 ifbandwidth=33.60Kb ]
 queue  vier bandwidth 3.36Kb hfsc( default ) 
   [ qid=8 ifname=tun1000000 ifbandwidth=33.60Kb ]
-queue  fuenf bandwidth 16.80Kb {subseven}
+queue  fuenf bandwidth 1.68Kb {subseven}
   [ qid=9 ifname=tun1000000 ifbandwidth=33.60Kb ]
-queue   subseven bandwidth 15.12Kb 
+queue   subseven bandwidth 1.44Kb 
   [ qid=10 ifname=tun1000000 ifbandwidth=33.60Kb ]
diff --git a/regress/sbin/pfctl/pfaltq12.in b/regress/sbin/pfctl/pfaltq12.in
index 4aeb4201f0e..900d80aacd4 100644
--- a/regress/sbin/pfctl/pfaltq12.in
+++ b/regress/sbin/pfctl/pfaltq12.in
@@ -3,7 +3,7 @@
 altq on lo0 tbrsize 1824 bandwidth 10Mb hfsc queue { eins zwei drei }
 queue eins bandwidth 10% hfsc(default linkshare(20% 20 5%))
 queue zwei bandwidth 40% hfsc(linkshare 35% upperlimit 5Mb)
-queue drei bandwidth 50% hfsc(linkshare(60% 20 40%) \
+queue drei bandwidth 50% hfsc(linkshare(45% 20 40%) \
 	upperlimit(65% 10 45%))
 
 
diff --git a/regress/sbin/pfctl/pfaltq12.ok b/regress/sbin/pfctl/pfaltq12.ok
index 8e5ef81bd30..049b93c0990 100644
--- a/regress/sbin/pfctl/pfaltq12.ok
+++ b/regress/sbin/pfctl/pfaltq12.ok
@@ -4,5 +4,5 @@ queue  eins bandwidth 1Mb hfsc( default linkshare(2Mb 20 500Kb) )
   [ qid=2 ifname=lo0 ifbandwidth=10Mb ]
 queue  zwei bandwidth 4Mb hfsc( linkshare 3.50Mb upperlimit 5Mb ) 
   [ qid=3 ifname=lo0 ifbandwidth=10Mb ]
-queue  drei bandwidth 5Mb hfsc( linkshare(6Mb 20 4Mb) upperlimit(6.50Mb 10 4.50Mb) ) 
+queue  drei bandwidth 5Mb hfsc( linkshare(4.50Mb 20 4Mb) upperlimit(6.50Mb 10 4.50Mb) ) 
   [ qid=4 ifname=lo0 ifbandwidth=10Mb ]
diff --git a/regress/sbin/pfctl/pfaltq13.in b/regress/sbin/pfctl/pfaltq13.in
index b9f30f8fabe..8786294a1c6 100644
--- a/regress/sbin/pfctl/pfaltq13.in
+++ b/regress/sbin/pfctl/pfaltq13.in
@@ -2,8 +2,8 @@
 
 altq on lo0 tbrsize 1824 bandwidth 10Mb hfsc queue { eins zwei drei }
 queue eins bandwidth 10% hfsc(default realtime(20% 20 5%))
-queue zwei bandwidth 40% hfsc(linkshare 35% realtime 5Mb)
-queue drei bandwidth 50% hfsc(realtime(60% 20 40%) \
+queue zwei bandwidth 40% hfsc(linkshare 35% realtime 0.5Mb)
+queue drei bandwidth 50% hfsc(realtime(55% 20 40%) \
 	upperlimit(65% 10 45%))
 
 
diff --git a/regress/sbin/pfctl/pfaltq13.ok b/regress/sbin/pfctl/pfaltq13.ok
index 6f63fd9046f..a8d402d691b 100644
--- a/regress/sbin/pfctl/pfaltq13.ok
+++ b/regress/sbin/pfctl/pfaltq13.ok
@@ -2,7 +2,7 @@ queue root_lo0 bandwidth 10Mb priority 0 {eins, zwei, drei}
   [ qid=1 ifname=lo0 ifbandwidth=10Mb ]
 queue  eins bandwidth 1Mb hfsc( default realtime(2Mb 20 500Kb) ) 
   [ qid=2 ifname=lo0 ifbandwidth=10Mb ]
-queue  zwei bandwidth 4Mb hfsc( realtime 5Mb linkshare 3.50Mb ) 
+queue  zwei bandwidth 4Mb hfsc( realtime 500Kb linkshare 3.50Mb ) 
   [ qid=3 ifname=lo0 ifbandwidth=10Mb ]
-queue  drei bandwidth 5Mb hfsc( realtime(6Mb 20 4Mb) upperlimit(6.50Mb 10 4.50Mb) ) 
+queue  drei bandwidth 5Mb hfsc( realtime(5.50Mb 20 4Mb) upperlimit(6.50Mb 10 4.50Mb) ) 
   [ qid=4 ifname=lo0 ifbandwidth=10Mb ]
diff --git a/regress/sbin/pfctl/pfaltq3.in b/regress/sbin/pfctl/pfaltq3.in
index 0a87ef0ac70..8558bdf888b 100644
--- a/regress/sbin/pfctl/pfaltq3.in
+++ b/regress/sbin/pfctl/pfaltq3.in
@@ -3,13 +3,13 @@
 # -two differently named queues must not share a qid, even on different ifs
 
 altq on lo0 tbrsize 1824 bandwidth 10Mb cbq queue { eins zwei drei }
-altq on tun1000000 tbrsize 1824 bandwidth 33600b cbq queue { vier zwei fuenf }
+altq on tun1000000 tbrsize 1824 bandwidth 128000b cbq queue { vier zwei fuenf }
 queue eins bandwidth 10% cbq(default)
-queue zwei bandwidth 80% { sub2 sub3 }
+queue zwei bandwidth 60% { sub2 sub3 }
 queue  sub2 bandwidth 50%
 queue  sub3 bandwidth 50%
-queue drei bandwidth 10% subseven
-queue vier bandwidth 50% cbq(default)
-queue fuenf bandwidth 50% subseven
+queue drei bandwidth 30% subseven
+queue vier bandwidth 25% cbq(default)
+queue fuenf bandwidth 15% subseven
 queue  subseven bandwidth 90%
 
diff --git a/regress/sbin/pfctl/pfaltq3.ok b/regress/sbin/pfctl/pfaltq3.ok
index c308f31f342..b8134080bb7 100644
--- a/regress/sbin/pfctl/pfaltq3.ok
+++ b/regress/sbin/pfctl/pfaltq3.ok
@@ -2,27 +2,27 @@ queue root_lo0 bandwidth 10Mb priority 0 cbq( wrr root ) {eins, zwei, drei}
   [ qid=1 ifname=lo0 ifbandwidth=10Mb ]
 queue  eins bandwidth 1Mb cbq( default ) 
   [ qid=3 ifname=lo0 ifbandwidth=10Mb ]
-queue  zwei bandwidth 8Mb {sub2, sub3}
+queue  zwei bandwidth 6Mb {sub2, sub3}
   [ qid=4 ifname=lo0 ifbandwidth=10Mb ]
-queue   sub2 bandwidth 4Mb 
+queue   sub2 bandwidth 3Mb 
   [ qid=5 ifname=lo0 ifbandwidth=10Mb ]
-queue   sub3 bandwidth 4Mb 
+queue   sub3 bandwidth 3Mb 
   [ qid=6 ifname=lo0 ifbandwidth=10Mb ]
-queue  drei bandwidth 1Mb {subseven}
+queue  drei bandwidth 3Mb {subseven}
   [ qid=7 ifname=lo0 ifbandwidth=10Mb ]
-queue   subseven bandwidth 900Kb 
+queue   subseven bandwidth 2.70Mb 
   [ qid=10 ifname=lo0 ifbandwidth=10Mb ]
-queue root_tun1000000 bandwidth 33.60Kb priority 0 cbq( wrr root ) {zwei, vier, fuenf}
-  [ 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=5 ifname=tun1000000 ifbandwidth=33.60Kb ]
-queue   sub3 bandwidth 13.40Kb 
-  [ qid=6 ifname=tun1000000 ifbandwidth=33.60Kb ]
-queue  vier bandwidth 16.80Kb cbq( default ) 
-  [ qid=8 ifname=tun1000000 ifbandwidth=33.60Kb ]
-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 ]
+queue root_tun1000000 bandwidth 128Kb priority 0 cbq( wrr root ) {zwei, vier, fuenf}
+  [ qid=2 ifname=tun1000000 ifbandwidth=128Kb ]
+queue  zwei bandwidth 76.80Kb {sub2, sub3}
+  [ qid=4 ifname=tun1000000 ifbandwidth=128Kb ]
+queue   sub2 bandwidth 38.40Kb 
+  [ qid=5 ifname=tun1000000 ifbandwidth=128Kb ]
+queue   sub3 bandwidth 38.40Kb 
+  [ qid=6 ifname=tun1000000 ifbandwidth=128Kb ]
+queue  vier bandwidth 32Kb cbq( default ) 
+  [ qid=8 ifname=tun1000000 ifbandwidth=128Kb ]
+queue  fuenf bandwidth 19.20Kb {subseven}
+  [ qid=9 ifname=tun1000000 ifbandwidth=128Kb ]
+queue   subseven bandwidth 17.28Kb 
+  [ qid=10 ifname=tun1000000 ifbandwidth=128Kb ]
diff --git a/regress/sbin/pfctl/pfaltq6.in b/regress/sbin/pfctl/pfaltq6.in
index dfab1585dc8..db9b5c1690b 100644
--- a/regress/sbin/pfctl/pfaltq6.in
+++ b/regress/sbin/pfctl/pfaltq6.in
@@ -3,9 +3,9 @@
 altq on lo0 tbrsize 1824 cbq bandwidth 10Mb queue { wim, the minibar is empty }
 queue wim bandwidth 10% cbq(default)
 queue the bandwidth 10%
-queue minibar bandwidth 80% priority 7
+queue minibar bandwidth 30% priority 7
 queue  is bandwidth 10%
-queue  empty bandwidth 90%
+queue  empty bandwidth 40%
 pass in on lo0 proto tcp to port 22 keep state queue(the minibar)
 pass in proto tcp to port 22 keep state queue(is empty)
 pass in proto tcp to port 22 keep state queue the
diff --git a/regress/sbin/pfctl/pfaltq6.ok b/regress/sbin/pfctl/pfaltq6.ok
index d59f464cc24..3e4e4514f43 100644
--- a/regress/sbin/pfctl/pfaltq6.ok
+++ b/regress/sbin/pfctl/pfaltq6.ok
@@ -4,11 +4,11 @@ queue  wim bandwidth 1Mb cbq( default )
   [ qid=2 ifname=lo0 ifbandwidth=10Mb ]
 queue  the bandwidth 1Mb 
   [ qid=3 ifname=lo0 ifbandwidth=10Mb ]
-queue  minibar bandwidth 8Mb priority 7 
+queue  minibar bandwidth 3Mb priority 7 
   [ qid=4 ifname=lo0 ifbandwidth=10Mb ]
 queue  is bandwidth 1Mb 
   [ qid=5 ifname=lo0 ifbandwidth=10Mb ]
-queue  empty bandwidth 9Mb 
+queue  empty bandwidth 4Mb 
   [ 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 ]