mirrors/pfsense
2
0
Fork 0
mirror of https://github.com/pfsense/pfsense.git synced 2025-10-26 11:38:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #812 from irconan/master

Browse Source 
Minor CoDel fixes, fix #3239 and #3240
This commit is contained in:
Renato Botelho 2013-09-28 06:15:23 -07:00
commit 0bb7bfbbd9
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
etc/inc/shaper.inc
View File

@ -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']);