From 162ad035fa439749384003ae61770ad074771d93 Mon Sep 17 00:00:00 2001
From: Eric Dumazet <eric.dumazet@gmail.com>
Date: Fri, 29 Jul 2011 19:22:42 +0000
Subject: [PATCH] --- yaml --- r: 262447 b: refs/heads/master c:
 e1738bd9cecc5c867b0e2996470c1ff20f66ba79 h: refs/heads/master i:   262445:
 19c947d0e5aa6a80c38fd3e18f0af36787cc3795   262443:
 3c04b91affcc94601060e458ee0609552f8e02b9   262439:
 d050776c97920f0ec3ec06c45a5a5bb6de12fe5f   262431:
 bb23857d9d7d0a9c1682c0b876ca2b2f30a2e786 v: v3

---
 [refs]                    | 2 +-
 trunk/net/sched/sch_sfq.c | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 02bb0b33d416..ca922abb6c29 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 956837f7c954443f426a82ba6f17b33488cf9a0c
+refs/heads/master: e1738bd9cecc5c867b0e2996470c1ff20f66ba79
diff --git a/trunk/net/sched/sch_sfq.c b/trunk/net/sched/sch_sfq.c
index 4536ee64383e..4f5510e2bd6f 100644
--- a/trunk/net/sched/sch_sfq.c
+++ b/trunk/net/sched/sch_sfq.c
@@ -410,7 +410,12 @@ sfq_enqueue(struct sk_buff *skb, struct Qdisc *sch)
 	/* 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 *