From 937e7ed523f5ada2327bb30dcea0ab9f7ee4813b Mon Sep 17 00:00:00 2001 From: Thomas Graf Date: Mon, 18 Jul 2005 13:30:53 -0700 Subject: [PATCH] --- yaml --- r: 4903 b: refs/heads/master c: 452f299da3253f65020143f743c2e207b752547b h: refs/heads/master i: 4901: dde7ea2f793ba1fa6748ddc75d52324c4e4d39cf 4899: dcb9f5afc93de6b3b9977b9e10f2cc92ce3fb56c 4895: 758081571e229449bfb059f1898d1522dcc770e4 v: v3 --- [refs] | 2 +- trunk/net/sched/sch_generic.c | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 73d00b04f371..b1f8c9573f78 100644 --- 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 index 73e218e646ac..8edefd5d095d 100644 --- 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); } }