From 705033251af26b045ede86b95fbf0e75917a9b95 Mon Sep 17 00:00:00 2001
From: Jarek Poplawski <jarkao2@gmail.com>
Date: Wed, 5 Nov 2008 16:02:34 -0800
Subject: [PATCH] --- yaml --- r: 121725 b: refs/heads/master c:
 61c9eaf90081cbe6dc4f389e0056bff76eca19ec h: refs/heads/master i:   121723:
 42c996d725308dc08d90bfe4507f5c64ef4df2cf v: v3

---
 [refs]                          |  2 +-
 trunk/include/net/sch_generic.h | 12 +++++++++---
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index f327321874c2..3a9482cc21a4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0a36b345ab99d6b3c96999e7e3b79bd243cf9bf7
+refs/heads/master: 61c9eaf90081cbe6dc4f389e0056bff76eca19ec
diff --git a/trunk/include/net/sch_generic.h b/trunk/include/net/sch_generic.h
index 9dcb5bfe094a..64ae1ba9f554 100644
--- a/trunk/include/net/sch_generic.h
+++ b/trunk/include/net/sch_generic.h
@@ -442,8 +442,12 @@ static inline struct sk_buff *qdisc_peek_head(struct Qdisc *sch)
 static inline struct sk_buff *qdisc_peek_dequeued(struct Qdisc *sch)
 {
 	/* we can reuse ->gso_skb because peek isn't called for root qdiscs */
-	if (!sch->gso_skb)
+	if (!sch->gso_skb) {
 		sch->gso_skb = sch->dequeue(sch);
+		if (sch->gso_skb)
+			/* it's still part of the queue */
+			sch->q.qlen++;
+	}
 
 	return sch->gso_skb;
 }
@@ -453,10 +457,12 @@ static inline struct sk_buff *qdisc_dequeue_peeked(struct Qdisc *sch)
 {
 	struct sk_buff *skb = sch->gso_skb;
 
-	if (skb)
+	if (skb) {
 		sch->gso_skb = NULL;
-	else
+		sch->q.qlen--;
+	} else {
 		skb = sch->dequeue(sch);
+	}
 
 	return skb;
 }