diff options
| author | Arjan van de Ven <arjan@linux.intel.com> | 2008-09-01 15:00:54 -0700 |
|---|---|---|
| committer | Arjan van de Ven <arjan@linux.intel.com> | 2008-09-05 21:35:11 -0700 |
| commit | 23dd7bb09bd8d7efd8a602aed97b93d52f85e675 (patch) | |
| tree | 74cdfb4e88896e6c902acab77a6e2d2417425bd2 | |
| parent | 76369470b7e5f97fc1a8af83c45b9ff739b08cb6 (diff) | |
| download | kernel-crypto-23dd7bb09bd8d7efd8a602aed97b93d52f85e675.tar.gz kernel-crypto-23dd7bb09bd8d7efd8a602aed97b93d52f85e675.tar.xz kernel-crypto-23dd7bb09bd8d7efd8a602aed97b93d52f85e675.zip | |
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.
Signed-off-by: Arjan van de Ven <arjan@linux.intel.com>
| -rw-r--r-- | net/sched/sch_cbq.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/net/sched/sch_cbq.c b/net/sched/sch_cbq.c index 8b06fa90048..03e389e8d94 100644 --- a/net/sched/sch_cbq.c +++ b/net/sched/sch_cbq.c @@ -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++; |