new 0.8.3 trunk made from 0.8.2 branch

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

diff --git a/conf/prometheus.conf b/conf/prometheus.conf
index 0e5ab6e230ba2be6b5986de9323d3452fc1fd4d9..2160698b570a250b7034a36fdeb5a4915a09e11a 100644 (file)
--- a/conf/prometheus.conf
+++ b/conf/prometheus.conf
@@ -82,11 +82,9 @@ htb-r2q              1
 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-priorities       8       #number of priority levels - 2
 magic-treshold         2       #kbps
 #--------------------------------------------------------------------------
 #Magic data limit based od guaranted bandwidth in kbps fine tunes HTB ceil:
@@ -113,10 +111,10 @@ adsl-prometheus-magic-fixed-prio          0
 #--------------------------------------------------------------------------
 #These settings are keyword-derived ! (see "keyword" section)
 #--------------------------------------------------------------------------
-via-prometheus-htb-default-prio                1       #can be 1...magic-priorities-2
+via-prometheus-htb-default-prio                1       #can be 1...7
 via-prometheus-htb-rate-bonus          0       #kbps
 via-prometheus-htb-ceil-malus          0       #kbps
-adsl-prometheus-htb-default-prio       1       
+adsl-prometheus-htb-default-prio       1
 adsl-prometheus-htb-rate-bonus         16
 adsl-prometheus-htb-ceil-malus         0
 #==========================================================================