Thread (4 messages) 4 messages, 3 authors, 2011-08-10

Re: [PATCH] net_sched: prio: use qdisc_dequeue_peeked

flat view

From: Florian Westphal <fw@strlen.de>
Date: 2011-08-09 13:45:33

Eric Dumazet [off-list ref] wrote:
quoted
 Eric, does this look correct to you?
 I am not sure if sfq needs fixing instead of this patch here.
diff --git a/net/sched/sch_prio.c b/net/sched/sch_prio.c
index 2a318f2..b5d56a2 100644
--- a/net/sched/sch_prio.c
+++ b/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--;

Hi Florian

Are you sure this patch is still needed, after commit 
e1738bd9cecc5c867b0e2996470c1ff20f66ba79
(sch_sfq: fix sfq_enqueue())
Yes, I double checked.  This patch is applied, also
I see HFSC complaints even without that code path touched by
"sch_sfq: fix sfq_enqueue" being hit.
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help