Skip to contentSkip to conversation

hrtimer: convert net::sched_cbq to the new hrtimer apis

PATCH New Arjan van de Ven 1 participant 1 message Sep 7, 2008

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 hrtimer: convert net::sched_cbq to the new hrtimer apis

Hi,

as part of a rework of select/poll and hrtimers, I needed to make a slight API adjustment to networking code; the patch for this is below.

Is it ok to carry this patch as part of the hrtimer tree? (if not it's going to be .. interesting in terms of sequencing the introduction of new apis versus this patch versus the rest)

Quoted 1 line

From ae2c9cc58e636751128a760a3b7a586abd0ff91b Mon Sep 17 00:00:00 2001

From: Arjan van de Ven <[email protected]>
Date: Mon, 1 Sep 2008 15:00:54 -0700
Subject: [PATCH] hrtimer: convert net::sched_cbq to the new hrtimer apis

In order to be able to do range hrtimers we need to use accessor functions to the "expire" member of the hrtimer struct.
This patch converts sched_cbq to these accessors.

---
 net/sched/sch_cbq.c |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)
net/sched/sch_cbq.c +4 -3
index 8b06fa9..03e389e 100644
@@ -545,9 +545,10 @@ static void cbq_ovl_delay(struct cbq_class *cl)
 			expires = ktime_set(0, 0);
 			expires = ktime_add_ns(expires, PSCHED_US2NS(sched));
 			if (hrtimer_try_to_cancel(&q->delay_timer) &&
-			    ktime_to_ns(ktime_sub(q->delay_timer.expires,
-						  expires)) > 0)
-				q->delay_timer.expires = expires;
+			    ktime_to_ns(ktime_sub(
+					hrtimer_get_expires(&q->delay_timer),
+					expires)) > 0)
+				hrtimer_set_expires(&q->delay_timer, expires);
 			hrtimer_restart(&q->delay_timer);
 			cl->delayed = 1;
 			cl->xstats.overactions++;
Signature · 1 line
1.5.5.1