From c27edf5559a35757d38c1c5f10fdf69254fcbe11 Mon Sep 17 00:00:00 2001
From: Richard Connon <conan@irconan.co.uk>
Date: Sat, 28 Sep 2013 12:37:51 +0100
Subject: [PATCH 1/2] Fixed typo in CoDel wiki link

---
 etc/inc/shaper.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/etc/inc/shaper.inc b/etc/inc/shaper.inc
index 24aa36068f..c2717ad98f 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>";

From 9f6919e618715d15513bd6265216f7be6c0bc4a1 Mon Sep 17 00:00:00 2001
From: Richard Connon <conan@irconan.co.uk>
Date: Sat, 28 Sep 2013 13:12:35 +0100
Subject: [PATCH 2/2] Fix codel not being applied on non-priq queue types

---
 etc/inc/shaper.inc | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/etc/inc/shaper.inc b/etc/inc/shaper.inc
index c2717ad98f..5c36ffe39f 100644
--- a/etc/inc/shaper.inc
+++ b/etc/inc/shaper.inc
@@ -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']);