---

yaml --- r: 4903 b: refs/heads/master c: 452f299 h: refs/heads/master i: 4901: dde7ea2 4899: dcb9f5a 4895: 7580815 v: v3
git-mirror · Jul 18, 2005 · 937e7ed · 937e7ed
1 parent 4cd49de
commit 937e7ed
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d7c7ed4dbc66c5f4dfa5615cdfc5009af3b3b137
+refs/heads/master: 452f299da3253f65020143f743c2e207b752547b
diff --git a/trunk/net/sched/sch_generic.c b/trunk/net/sched/sch_generic.c
@@ -331,11 +331,10 @@ static struct sk_buff *pfifo_fast_dequeue(struct Qdisc* qdisc)
 	int prio;
 	struct sk_buff_head *list = qdisc_priv(qdisc);
 
-	for (prio = 0; prio < PFIFO_FAST_BANDS; prio++, list++) {
-		struct sk_buff *skb = __qdisc_dequeue_head(qdisc, list);
-		if (skb) {
+	for (prio = 0; prio < PFIFO_FAST_BANDS; prio++) {
+		if (!skb_queue_empty(list + prio)) {
 			qdisc->q.qlen--;
-			return skb;
+			return __qdisc_dequeue_head(qdisc, list + prio);
 		}
 	}