From 5fbee32e5336d4232faeb8ba25694f8e9cf9eb57 Mon Sep 17 00:00:00 2001
From: Patrick McHardy <kaber@trash.net>
Date: Mon, 24 Nov 2008 15:46:08 -0800
Subject: [PATCH] --- yaml --- r: 122120 b: refs/heads/master c:
 3f0947c3ffaed33c1c38b79e4b17f75ba072d3e9 h: refs/heads/master v: v3

---
 [refs]                    | 2 +-
 trunk/net/sched/sch_drr.c | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 380c7bc859a2..95ad481b7418 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4b40eed73e3787d60160beed1352ceadd24f6be1
+refs/heads/master: 3f0947c3ffaed33c1c38b79e4b17f75ba072d3e9
diff --git a/trunk/net/sched/sch_drr.c b/trunk/net/sched/sch_drr.c
index 37e6ab99bbea..e7a7e87b141a 100644
--- a/trunk/net/sched/sch_drr.c
+++ b/trunk/net/sched/sch_drr.c
@@ -373,11 +373,13 @@ static struct sk_buff *drr_dequeue(struct Qdisc *sch)
 	struct sk_buff *skb;
 	unsigned int len;
 
-	while (!list_empty(&q->active)) {
+	if (list_empty(&q->active))
+		goto out;
+	while (1) {
 		cl = list_first_entry(&q->active, struct drr_class, alist);
 		skb = cl->qdisc->ops->peek(cl->qdisc);
 		if (skb == NULL)
-			goto skip;
+			goto out;
 
 		len = qdisc_pkt_len(skb);
 		if (len <= cl->deficit) {
@@ -390,9 +392,9 @@ static struct sk_buff *drr_dequeue(struct Qdisc *sch)
 		}
 
 		cl->deficit += cl->quantum;
-skip:
 		list_move_tail(&cl->alist, &q->active);
 	}
+out:
 	return NULL;
 }