generic: add upstream commit id to codel patches and refresh those

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@33560 3c298f89-4303-0410-b956-a3cf2f4a3e73
master
Gabor Juhos 2012-09-26 14:17:17 +00:00
parent e2356de36b
commit 0fe0b149fa
8 changed files with 37 additions and 34 deletions

View File

@ -1,7 +1,9 @@
From 76e3cc126bb223013a6b9a0e2a51238d1ef2e409 Mon Sep 17 00:00:00 2001
From a93fd80d261f1dc2788442dba8dd5701363d3d6e Mon Sep 17 00:00:00 2001
From: Eric Dumazet <edumazet@google.com>
Date: Thu, 10 May 2012 07:51:25 +0000
Subject: [PATCH 01/41] codel: Controlled Delay AQM
Subject: [PATCH] codel: Controlled Delay AQM
commit 76e3cc126bb223013a6b9a0e2a51238d1ef2e409 upstream.
An implementation of CoDel AQM, from Kathleen Nichols and Van Jacobson.

View File

@ -1,7 +1,9 @@
From 536edd67109df5e0cdb2c4ee759e9bade7976367 Mon Sep 17 00:00:00 2001
From 4a8056dfeef49b306ad6af24a5563d7d6867aae0 Mon Sep 17 00:00:00 2001
From: Eric Dumazet <edumazet@google.com>
Date: Sat, 12 May 2012 03:32:13 +0000
Subject: [PATCH 37/41] codel: use Newton method instead of sqrt() and divides
Subject: [PATCH] codel: use Newton method instead of sqrt() and divides
commit 536edd67109df5e0cdb2c4ee759e9bade7976367 upstream.
As Van pointed out, interval/sqrt(count) can be implemented using
multiplies only.

View File

@ -1,7 +1,9 @@
From 4b549a2ef4bef9965d97cbd992ba67930cd3e0fe Mon Sep 17 00:00:00 2001
From f8cf19c19528a468cc0b9846c0328a94cccdc605 Mon Sep 17 00:00:00 2001
From: Eric Dumazet <edumazet@google.com>
Date: Fri, 11 May 2012 09:30:50 +0000
Subject: [PATCH 38/41] fq_codel: Fair Queue Codel AQM
Subject: [PATCH] fq_codel: Fair Queue Codel AQM
commit 4b549a2ef4bef9965d97cbd992ba67930cd3e0fe upstream.
Fair Queue Codel packet scheduler

View File

@ -1,11 +1,13 @@
From ce5b4b977127ee20c3f9c3fd3637cd3796f649f5 Mon Sep 17 00:00:00 2001
From 18c12e496ead3306de00a82d0bc73d71b34d7c24 Mon Sep 17 00:00:00 2001
From: Geert Uytterhoeven <geert@linux-m68k.org>
Date: Mon, 14 May 2012 09:47:05 +0000
Subject: [PATCH 44/50] net/codel: Add missing #include <linux/prefetch.h>
Subject: [PATCH] net/codel: Add missing #include <linux/prefetch.h>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
commit ce5b4b977127ee20c3f9c3fd3637cd3796f649f5 upstream.
m68k allmodconfig:
net/sched/sch_codel.c: In function dequeue:

View File

@ -1,7 +1,9 @@
From 669d67bf777def468970f2dcba1537edf3b2d329 Mon Sep 17 00:00:00 2001
From b49ab5f6bb7e609190065cb9a605de809e50ab60 Mon Sep 17 00:00:00 2001
From: Sasha Levin <levinsasha928@gmail.com>
Date: Mon, 14 May 2012 11:57:06 +0000
Subject: [PATCH 45/50] net: codel: fix build errors
Subject: [PATCH] net: codel: fix build errors
commit 669d67bf777def468970f2dcba1537edf3b2d329 upstream.
Fix the following build error:

View File

@ -1,8 +1,9 @@
From 6ff272c9ad65eda219cd975b9da2dbc31cc812ee Mon Sep 17 00:00:00 2001
From 03333931c17d9c62ba4063d4e4fec1578c0729a7 Mon Sep 17 00:00:00 2001
From: Eric Dumazet <eric.dumazet@gmail.com>
Date: Sat, 12 May 2012 21:23:23 +0000
Subject: [PATCH 46/50] codel: use u16 field instead of 31bits for
rec_inv_sqrt
Subject: [PATCH] codel: use u16 field instead of 31bits for rec_inv_sqrt
commit 6ff272c9ad65eda219cd975b9da2dbc31cc812ee upstream.
David pointed out gcc might generate poor code with 31bit fields.

View File

@ -1,4 +1,9 @@
From 7bd90773f89001ea4960ed47676b550137f3facb Mon Sep 17 00:00:00 2001
From: Eric Dumazet <edumazet@google.com>
Date: Wed, 16 May 2012 04:39:09 +0000
Subject: [PATCH] fq_codel: should use qdisc backlog as threshold
commit 865ec5523dadbedefbc5710a68969f686a28d928 upstream.
codel_should_drop() logic allows a packet being not dropped if queue
size is under max packet size.
@ -14,6 +19,7 @@ Signed-off-by: Eric Dumazet <edumazet@google.com>
Cc: Dave Taht <dave.taht@bufferbloat.net>
Cc: Kathleen Nichols <nichols@pollere.com>
Cc: Van Jacobson <van@pollere.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
---
include/net/codel.h | 15 +++++++--------
net/sched/sch_codel.c | 4 ++--

View File

@ -1,16 +1,9 @@
From patchwork Mon Jul 30 06:52:21 2012
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: codel: refine one condition to avoid a nul rec_inv_sqrt
Date: Sun, 29 Jul 2012 20:52:21 -0000
From: Eric Dumazet <eric.dumazet@gmail.com>
X-Patchwork-Id: 173968
Message-Id: <1343631141.2626.13293.camel@edumazet-glaptop>
To: David Miller <davem@davemloft.net>
Cc: netdev <netdev@vger.kernel.org>, Anton Mich <lp2s1h@gmail.com>
From b8fc328668a74e1314a19266755a54abd875e5a6 Mon Sep 17 00:00:00 2001
From: Eric Dumazet <edumazet@google.com>
Date: Sun, 29 Jul 2012 20:52:21 +0000
Subject: [PATCH] codel: refine one condition to avoid a nul rec_inv_sqrt
commit 2359a47671fc4fb0fe5e9945f76c2cb10792c0f8 upstream.
One condition before codel_Newton_step() was not good if
we never left the dropping state for a flow. As a result
@ -27,18 +20,11 @@ a fix.
Reported-by: Anton Mich <lp2s1h@gmail.com>
Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
---
include/net/codel.h | 8 ++++++--
include/net/codel.h | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
--- a/include/net/codel.h
+++ b/include/net/codel.h
@@ -305,6 +305,8 @@ static struct sk_buff *codel_dequeue(str