---

yaml --- r: 262447 b: refs/heads/master c: e1738bd h: refs/heads/master i: 262445: 19c947d 262443: 3c04b91 262439: d050776 262431: bb23857 v: v3
git-mirror · Aug 1, 2011 · 162ad03 · 162ad03
1 parent df529b4
commit 162ad03
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git 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
@@ -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 *