From 2bb56acc0c06fea8bbcbeca7324ddf98682f057d Mon Sep 17 00:00:00 2001 From: juhosg Date: Fri, 18 May 2012 20:10:51 +0000 Subject: linux/2.6.39: R.I.P. git-svn-id: svn://svn.openwrt.org/openwrt/trunk@31808 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- .../patches-2.6.39/622-sched_sfq_fix_enqueue.patch | 41 ---------------------- 1 file changed, 41 deletions(-) delete mode 100644 target/linux/generic/patches-2.6.39/622-sched_sfq_fix_enqueue.patch (limited to 'target/linux/generic/patches-2.6.39/622-sched_sfq_fix_enqueue.patch') diff --git a/target/linux/generic/patches-2.6.39/622-sched_sfq_fix_enqueue.patch b/target/linux/generic/patches-2.6.39/622-sched_sfq_fix_enqueue.patch deleted file mode 100644 index b84910687..000000000 --- a/target/linux/generic/patches-2.6.39/622-sched_sfq_fix_enqueue.patch +++ /dev/null @@ -1,41 +0,0 @@ -From: Eric Dumazet -Date: Fri, 29 Jul 2011 19:22:42 +0000 (+0000) -Subject: sch_sfq: fix sfq_enqueue() -X-Git-Tag: v3.1-rc1~24^2~29 -X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=e1738bd9cecc5c867b0e2996470c1ff20f66ba79 - -sch_sfq: fix sfq_enqueue() - -commit 8efa88540635 (sch_sfq: avoid giving spurious NET_XMIT_CN signals) -forgot to call qdisc_tree_decrease_qlen() to signal upper levels that a -packet (from another flow) was dropped, leading to various problems. - -With help from Michal Soltys and Michal Pokrywka, who did a bisection. - -Bugzilla ref: https://bugzilla.kernel.org/show_bug.cgi?id=39372 -Debian ref: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=631945 - -Reported-by: Lucas Bocchi -Reported-and-bisected-by: Michal Pokrywka -Signed-off-by: Eric Dumazet -CC: Michal Soltys -Acked-by: Patrick McHardy -Signed-off-by: David S. Miller ---- - ---- a/net/sched/sch_sfq.c -+++ b/net/sched/sch_sfq.c -@@ -410,7 +410,12 @@ sfq_enqueue(struct sk_buff *skb, struct - /* Return Congestion Notification only if we dropped a packet - * from this flow. - */ -- return (qlen != slot->qlen) ? NET_XMIT_CN : NET_XMIT_SUCCESS; -+ if (qlen != slot->qlen) -+ return NET_XMIT_CN; -+ -+ /* As we dropped a packet, better let upper stack know this */ -+ qdisc_tree_decrease_qlen(sch, 1); -+ return NET_XMIT_SUCCESS; - } - - static struct sk_buff * -- cgit v1.2.3