diff options
| author | Ermal <eri@pfsense.org> | 2010-08-03 18:12:40 +0000 |
|---|---|---|
| committer | Ermal <eri@pfsense.org> | 2010-08-03 18:12:40 +0000 |
| commit | 7ed9c6acdf2435ea95d83b09fb87b6ef8b279b37 (patch) | |
| tree | 8daa819beb90689e3fdb72c5bccdfc28619da719 /etc | |
| parent | 0f0fff153a72e49de1a5aea8e2b5a23750dbdce8 (diff) | |
| download | pfsense-7ed9c6acdf2435ea95d83b09fb87b6ef8b279b37.zip pfsense-7ed9c6acdf2435ea95d83b09fb87b6ef8b279b37.tar.gz | |
Resolves #716. Correctly unset values of m1 and d on HFSC and appropriate special values on other schedulers if previously they had a value.
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/inc/shaper.inc | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/etc/inc/shaper.inc b/etc/inc/shaper.inc index 7fb3e68..1a98b6e 100644 --- a/etc/inc/shaper.inc +++ b/etc/inc/shaper.inc @@ -1235,7 +1235,6 @@ class hfsc_queue extends priq_queue { /* * HFSC can have nested queues. */ - function CanHaveChildren() { return true; } @@ -1603,6 +1602,10 @@ class hfsc_queue extends priq_queue { $this->SetL_m1($cflink['linkshare1']); $this->SetL_d($cflink['linkshare2']); $this->SetLinkshare(); + } else { + $this->SetL_m1(""); + $this->SetL_d(""); + $this->DisableLinkshare(); } if (!empty($cflink['linkshare3'])) { $this->SetL_m2($cflink['linkshare3']); @@ -1615,6 +1618,10 @@ class hfsc_queue extends priq_queue { $this->SetR_m1($cflink['realtime1']); $this->SetR_d($cflink['realtime2']); $this->SetRealtime(); + } else { + $this->SetR_m1(""); + $this->SetR_d(""); + $this->DisableRealtime(); } if (!empty($cflink['realtime3'])) { $this->SetR_m2($cflink['realtime3']); @@ -1627,6 +1634,10 @@ class hfsc_queue extends priq_queue { $this->SetU_m1($cflink['upperlimit1']); $this->SetU_d($cflink['upperlimit2']); $this->SetUpperlimit(); + } else { + $this->SetU_m1(""); + $this->SetU_d(""); + $this->DisableUpperlimit(); } if (!empty($cflink['upperlimit3'])) { $this->SetU_m2($cflink['upperlimit3']); @@ -2169,6 +2180,8 @@ class cbq_queue extends priq_queue { parent::ReadConfig($q); if (!empty($q['borrow'])) $this->SetBorrow("on"); + else + $this->SetBorrow(""); } function build_javascript() { @@ -2443,8 +2456,12 @@ class fairq_queue extends priq_queue { parent::ReadConfig($q); if (!empty($q['buckets'])) $this->SetBuckets($q['buckets']); + else + $this->SetBuckets(""); if (!empty($q['hogs']) && is_valid_shaperbw($q['hogs'])) $this->SetHogs($q['hogs']); + else + $this->SetHogs(""); } function build_javascript() { |
