new 0.8.3 trunk made from 0.8.2 branch

[svn/Prometheus-QoS/.git] / examples / prometheus.conf

diff --git a/examples/prometheus.conf b/examples/prometheus.conf
index fff604bd79e175caf3c5791f15a122c577704315..5a416979f8f706ed9ede03b26867f6475e23b546 100644 (file)
--- a/examples/prometheus.conf
+++ b/examples/prometheus.conf
@@ -83,11 +83,9 @@ htb-leaf-discipline  sfq perturb 5
 filter-type             classify #or mark 
 #==========================================================================
 #magic-include-upload - is data counter sum of upload and download ?
 filter-type             classify #or mark 
 #==========================================================================
 #magic-include-upload - is data counter sum of upload and download ?

-#magic-priorities - prioty levels are used by magic-relative-prio

 #magic-treshold - heaviest downloader: htb-rate, 2nd: htb-rate+magic-treshold
 #==========================================================================
 magic-include-upload   1       #1=yes|0=no
 #magic-treshold - heaviest downloader: htb-rate, 2nd: htb-rate+magic-treshold
 #==========================================================================
 magic-include-upload   1       #1=yes|0=no

-magic-priorities       8       #number of priority levels - 2

 magic-treshold         2       #kbps
 #--------------------------------------------------------------------------
 #Magic data limit based od guaranted bandwidth in kbps fine tunes HTB ceil:
 magic-treshold         2       #kbps
 #--------------------------------------------------------------------------
 #Magic data limit based od guaranted bandwidth in kbps fine tunes HTB ceil:


@@ -126,21 +124,21 @@ backbone-bezfup-magic-fixed-prio  0
 #--------------------------------------------------------------------------
 #These settings are keyword-derived ! (see "keyword" section)
 #--------------------------------------------------------------------------
 #--------------------------------------------------------------------------
 #These settings are keyword-derived ! (see "keyword" section)
 #--------------------------------------------------------------------------

-wifi-normal-htb-default-prio           1       #can be 1...magic-priorities-2
+wifi-normal-htb-default-prio           1       #can be 1...7 

 wifi-normal-htb-rate-bonus             0       #kbps
 wifi-normal-htb-ceil-malus             0       #kbps
 wifi-normal-htb-rate-bonus             0       #kbps
 wifi-normal-htb-ceil-malus             0       #kbps

-wifi-plus-htb-default-prio             1       
+wifi-plus-htb-default-prio             1

 wifi-plus-htb-rate-bonus               16
 wifi-plus-htb-rate-bonus               16

-wifi-plus-htb-ceil-malus               0       
-backbone-normal-htb-default-prio       1       
+wifi-plus-htb-ceil-malus               0
+backbone-normal-htb-default-prio       1

 backbone-normal-htb-rate-bonus         16
 backbone-normal-htb-rate-bonus         16

-backbone-normal-htb-ceil-malus         0       
-backbone-plus-htb-default-prio         1       
+backbone-normal-htb-ceil-malus         0
+backbone-plus-htb-default-prio         1

 backbone-plus-htb-rate-bonus           32
 backbone-plus-htb-rate-bonus           32

-backbone-plus-htb-ceil-malus           0       
-backbone-bezfup-htb-default-prio       2       
+backbone-plus-htb-ceil-malus           0
+backbone-bezfup-htb-default-prio       2

 backbone-bezfup-htb-rate-bonus         0
 backbone-bezfup-htb-rate-bonus         0

-backbone-bezfup-htb-ceil-malus         0       
+backbone-bezfup-htb-ceil-malus         0

 #==========================================================================
 #Credit file settings - stores unused credit from previous runs
 #--------------------------------------------------------------------------
 #==========================================================================
 #Credit file settings - stores unused credit from previous runs
 #--------------------------------------------------------------------------