diff options
| author | Renato Botelho <garga@pfSense.org> | 2013-09-28 06:15:23 -0700 |
|---|---|---|
| committer | Renato Botelho <garga@pfSense.org> | 2013-09-28 06:15:23 -0700 |
| commit | 0bb7bfbbd9f0881a6d1970540068c707f4feb69f (patch) | |
| tree | 7ecd2bb719965b03f04a0ce9d90e447dd91bb46b | |
| parent | 93821aea2cfaa1b93890bdc3eafceadfc940d5cb (diff) | |
| parent | 9f6919e618715d15513bd6265216f7be6c0bc4a1 (diff) | |
| download | pfsense-0bb7bfbbd9f0881a6d1970540068c707f4feb69f.zip pfsense-0bb7bfbbd9f0881a6d1970540068c707f4feb69f.tar.gz | |
Merge pull request #812 from irconan/master
Minor CoDel fixes, fix #3239 and #3240
| -rw-r--r-- | etc/inc/shaper.inc | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/etc/inc/shaper.inc b/etc/inc/shaper.inc index 24aa360..5c36ffe 100644 --- a/etc/inc/shaper.inc +++ b/etc/inc/shaper.inc @@ -1225,7 +1225,7 @@ class priq_queue { $tmpvalue = $this->GetCodel(); if(!empty($tmpvalue)) $form .= " checked=\"checked\""; - $form .= " /> <a target=\"_new\" href=\"http://http://www.bufferbloat.net/projects/codel/wiki\">" . gettext("Codel Active Queue") . "</a><br/>"; + $form .= " /> <a target=\"_new\" href=\"http://www.bufferbloat.net/projects/codel/wiki\">" . gettext("Codel Active Queue") . "</a><br/>"; $form .= "<span class=\"vexpl\"><br/>" . gettext("Select options for this queue"); $form .= "</span></td></tr><tr>"; $form .= "<td width=\"22%\" class=\"vncellreq\">" . gettext("Description") . "</td>"; @@ -2046,6 +2046,9 @@ class hfsc_queue extends priq_queue { $cflink['ecn'] = trim($this->GetEcn()); if (empty($cflink['ecn'])) unset($cflink['ecn']); + $cflink['codel'] = trim($this->GetCodel()); + if (empty($cflink['codel'])) + unset($cflink['codel']); if ($this->GetLinkshare() <> "") { if ($this->GetL_m1() <> "") { $cflink['linkshare1'] = $this->GetL_m1(); @@ -2465,6 +2468,9 @@ class cbq_queue extends priq_queue { $cflink['ecn'] = trim($this->GetEcn()); if (empty($cflink['ecn'])) unset($cflink['ecn']); + $cflink['codel'] = trim($this->GetCodel()); + if (empty($cflink['codel'])) + unset($cflink['codel']); $cflink['borrow'] = trim($this->GetBorrow()); if (empty($cflink['borrow'])) unset($cflink['borrow']); @@ -2743,6 +2749,9 @@ class fairq_queue extends priq_queue { $cflink['ecn'] = trim($this->GetEcn()); if (empty($cflink['ecn'])) unset($cflink['ecn']); + $cflink['codel'] = trim($this->GetCodel()); + if (empty($cflink['codel'])) + unset($cflink['codel']); $cflink['buckets'] = trim($this->GetBuckets()); if (empty($cflink['buckets'])) unset($cflink['buckets']); |
