From: Patrick McHardy <kaber@trash.net>
Date: Fri, 16 Mar 2007 08:21:40 +0000 (-0700)
Subject: [NET_SCHED]: sch_cbq: fix cbq_undelay_prio for non-active priorites
X-Git-Tag: v2.6.22-rc1~1128^2~273
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e9054a339eb275c756efeeaee42af484ac72a3f4;p=linux-2.6

[NET_SCHED]: sch_cbq: fix cbq_undelay_prio for non-active priorites

cbq_undelay_prio is supposed to return a time delta, but returns the
current time for non-active priorities, causing cbq_undelay to mark
the priority as active and schedule a timer for twice the current
time.

Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/net/sched/sch_cbq.c b/net/sched/sch_cbq.c
index d29d121293..32f6a308ba 100644
--- a/net/sched/sch_cbq.c
+++ b/net/sched/sch_cbq.c
@@ -612,7 +612,7 @@ static unsigned long cbq_undelay_prio(struct cbq_sched_data *q, int prio)
 	unsigned long sched = now;
 
 	if (cl_prev == NULL)
-		return now;
+		return 0;
 
 	do {
 		cl = cl_prev->next_alive;