From dde8eb98356be28a23a485b94f6c8e2bb0c828aa Mon Sep 17 00:00:00 2001 From: Florian Westphal Date: Tue, 9 Aug 2011 02:04:43 +0000 Subject: [PATCH] --- yaml --- r: 262777 b: refs/heads/master c: 3557619f0f6f7496ed453d4825e24958ab1884e0 h: refs/heads/master i: 262775: 477e366cb3e34b1edb0a37ba4618cdbb64918e19 v: v3 --- [refs] | 2 +- trunk/net/sched/sch_prio.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index e44fc72ffe7e..2f40edbe0147 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9be6dd6510fde5cfa2ab73f238754d38ee6797bc +refs/heads/master: 3557619f0f6f7496ed453d4825e24958ab1884e0 diff --git a/trunk/net/sched/sch_prio.c b/trunk/net/sched/sch_prio.c index 2a318f2dc3e5..b5d56a22b1d2 100644 --- a/trunk/net/sched/sch_prio.c +++ b/trunk/net/sched/sch_prio.c @@ -112,7 +112,7 @@ static struct sk_buff *prio_dequeue(struct Qdisc *sch) for (prio = 0; prio < q->bands; prio++) { struct Qdisc *qdisc = q->queues[prio]; - struct sk_buff *skb = qdisc->dequeue(qdisc); + struct sk_buff *skb = qdisc_dequeue_peeked(qdisc); if (skb) { qdisc_bstats_update(sch, skb); sch->q.qlen--;