summaryrefslogtreecommitdiffstats
path: root/src/etc
diff options
context:
space:
mode:
authorLuiz Otavio O Souza <luiz@netgate.com>2016-03-24 16:12:05 -0500
committerLuiz Otavio O Souza <luiz@netgate.com>2016-03-24 16:14:22 -0500
commit4bf6e70f02597eae65c59c9d6ac5cf0f490a242b (patch)
tree30baebadd26dad34930f62383314d0a94c2d4d74 /src/etc
parentce798e75ddddace36aae98554532f6352febee54 (diff)
downloadpfsense-4bf6e70f02597eae65c59c9d6ac5cf0f490a242b.zip
pfsense-4bf6e70f02597eae65c59c9d6ac5cf0f490a242b.tar.gz
Disable the check of subqueues bandwidth until it is fixed.
Ticket #5721
Diffstat (limited to 'src/etc')
-rw-r--r--src/etc/inc/shaper.inc16
1 files changed, 9 insertions, 7 deletions
diff --git a/src/etc/inc/shaper.inc b/src/etc/inc/shaper.inc
index 8560b57..d041737 100644
--- a/src/etc/inc/shaper.inc
+++ b/src/etc/inc/shaper.inc
@@ -453,9 +453,10 @@ class altq_root_queue {
if ($data['bandwidth'] < 0) {
$input_errors[] = gettext("Bandwidth cannot be negative.");
}
- $sum = $this->GetTotalBw();
- if ($sum > $data['bandwidth'] * get_bandwidthtype_scale($data['bandwidthtype']))
- $input_errors[] = "The sum of child bandwidth is higher than parent.";
+ // This is wrong. Disabled until a proper fix is committed.
+ //$sum = $this->GetTotalBw();
+ //if ($sum > $data['bandwidth'] * get_bandwidthtype_scale($data['bandwidthtype']))
+ // $input_errors[] = "The sum of child bandwidth is higher than parent.";
if ($data['qlimit'] && (!is_numeric($data['qlimit']))) {
$input_errors[] = gettext("Qlimit must be an integer.");
}
@@ -1226,10 +1227,11 @@ class priq_queue {
if ($data['bandwidth'] < 0) {
$input_errors[] = gettext("Bandwidth cannot be negative.");
}
- $root = $this->GetRoot();
- $sum = $root->GetTotalBw();
- if ($sum > $root->GetBandwidth() * get_bandwidthtype_scale($root->GetBwscale()))
- $input_errors[] = "The sum of child bandwidth is higher than parent.";
+ // This is wrong. Disabled until a proper fix is committed.
+ //$root = $this->GetRoot();
+ //$sum = $root->GetTotalBw();
+ //if ($sum > $root->GetBandwidth() * get_bandwidthtype_scale($root->GetBwscale()))
+ // $input_errors[] = "The sum of child bandwidth is higher than parent.";
if ($data['priority'] && (!is_numeric($data['priority']) ||
($data['priority'] < 1) || ($data['priority'] > 15))) {
$input_errors[] = gettext("The priority must be an integer between 1 and 15.");
OpenPOWER on IntegriCloud